diff --git a/changelog/52167.fixed b/changelog/52167.fixed index db23e791e6e..4a13253aaaa 100644 --- a/changelog/52167.fixed +++ b/changelog/52167.fixed @@ -1 +1 @@ -Fixed x509.certificate_managed creates new certificate every run +Fixed x509.certificate_managed creates new certificate every run in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement. diff --git a/changelog/57535.fixed b/changelog/57535.fixed index 0560fa2e11d..23e8ceaff93 100644 --- a/changelog/57535.fixed +++ b/changelog/57535.fixed @@ -1 +1 @@ -Fixed x509.read_certificate error when reading a Microsoft CA issued certificate +Fixed x509.read_certificate error when reading a Microsoft CA issued certificate in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement. diff --git a/changelog/58165.fixed b/changelog/58165.fixed index 9e4e249b9c6..31a76928f7a 100644 --- a/changelog/58165.fixed +++ b/changelog/58165.fixed @@ -1 +1 @@ -Fixed warning about replace=True with x509.certificate_managed +Fixed warning about replace=True with x509.certificate_managed in the new cryptography x509 module. diff --git a/changelog/59169.fixed b/changelog/59169.fixed index 9ebfb446efd..718be2a22e3 100644 --- a/changelog/59169.fixed +++ b/changelog/59169.fixed @@ -1 +1 @@ -Fixed x509.certificate_managed has DoS effect on master +Fixed x509.certificate_managed has DoS effect on master in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement. diff --git a/changelog/59315.fixed b/changelog/59315.fixed index 55d7af4660c..67fa822f678 100644 --- a/changelog/59315.fixed +++ b/changelog/59315.fixed @@ -1 +1 @@ -Fixed x509.certificate_managed rolls certificates every now and then +Fixed x509.certificate_managed rolls certificates every now and then in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement. diff --git a/changelog/63103.fixed b/changelog/63103.fixed index 9229018bed3..65595f61ff8 100644 --- a/changelog/63103.fixed +++ b/changelog/63103.fixed @@ -1 +1 @@ -Fixed x509.create_csr creates invalid CSR by default +Fixed x509.create_csr creates invalid CSR by default in the new cryptography x509 module. diff --git a/changelog/63248.added b/changelog/63248.added index 060594ae43c..5c72116f055 100644 --- a/changelog/63248.added +++ b/changelog/63248.added @@ -1 +1 @@ -Added management of ECDSA/EdDSA private keys with x509 modules +Added management of ECDSA/EdDSA private keys with x509 modules in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement. diff --git a/changelog/63249.added b/changelog/63249.added index fc2b7e7d119..0b56b2146f2 100644 --- a/changelog/63249.added +++ b/changelog/63249.added @@ -1 +1 @@ -Added x509 modules support for different output formats +Added x509 modules support for different output formats in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement. diff --git a/salt/modules/x509.py b/salt/modules/x509.py index 9d2fa021094..b7c59c70234 100644 --- a/salt/modules/x509.py +++ b/salt/modules/x509.py @@ -5,7 +5,7 @@ Manage X509 certificates :depends: M2Crypto -.. deprecated:: 3006 +.. deprecated:: 3006.0 .. warning:: This module has been deprecated and will be removed diff --git a/salt/modules/x509_v2.py b/salt/modules/x509_v2.py index 6935c93e280..47865a7e893 100644 --- a/salt/modules/x509_v2.py +++ b/salt/modules/x509_v2.py @@ -4,7 +4,7 @@ Manage X.509 certificates :depends: cryptography -.. versionadded:: 3006 +.. versionadded:: 3006.0 This module represents a complete rewrite of the original ``x509`` modules and is named ``x509_v2`` since it introduces breaking changes. diff --git a/salt/states/x509.py b/salt/states/x509.py index 5a8633cc996..4153011c792 100644 --- a/salt/states/x509.py +++ b/salt/states/x509.py @@ -5,7 +5,7 @@ Manage X509 Certificates :depends: M2Crypto -.. deprecated:: 3006 +.. deprecated:: 3006.0 .. warning:: This module has been deprecated and will be removed diff --git a/salt/states/x509_v2.py b/salt/states/x509_v2.py index e54e343de71..8f0e8ae3a08 100644 --- a/salt/states/x509_v2.py +++ b/salt/states/x509_v2.py @@ -2,7 +2,7 @@ Manage X.509 certificates ========================= -.. versionadded:: 3006 +.. versionadded:: 3006.0 This module represents a complete rewrite of the original ``x509`` modules and is named ``x509_v2`` since it introduces breaking changes. @@ -706,7 +706,7 @@ def crl_managed( encoding Specify the encoding of the resulting certificate revocation list. - It can serialized as a ``pem`` text or binary ``der`` file. + It can be serialized as a ``pem`` text or binary ``der`` file. Defaults to ``pem``. extensions @@ -962,7 +962,7 @@ def csr_managed( encoding Specify the encoding of the resulting certificate revocation list. - It can serialized as a ``pem`` text or binary ``der`` file. + It can be serialized as a ``pem`` text or binary ``der`` file. Defaults to ``pem``. kwargs