add missing properties to padding classes

Author: mathiasertl

CHANGELOG.rst

@@ -23,6 +23,13 @@ Changelog
   instances of classes in
   :mod:`~cryptography.hazmat.primitives.asymmetric.padding`
   comparable.
+* Added `salt_length` property to
+  :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS`.
+* Added `label` property to
+  :class:`~cryptography.hazmat.primitives.asymmetric.padding.OAEP`.
+* Added `algorithm` property to
+  :class:`~cryptography.hazmat.primitives.asymmetric.padding.MGF1`.
+
 
 .. _v45-0-6:
 

docs/hazmat/primitives/asymmetric/rsa.rst

@@ -325,6 +325,14 @@ Padding
 
         The padding's mask generation function (MGF).
 
+    .. attribute:: salt_length
+
+        :type: int
+
+        .. versionadded:: 46.0.0
+
+        The length of the salt.
+
 .. class:: OAEP(mgf, algorithm, label)
 
     .. versionadded:: 0.4
@@ -351,6 +359,14 @@ Padding
 
         The padding's hash algorithm.
 
+    .. attribute:: label
+
+        :type: bytes | None
+
+        .. versionadded:: 42.0.0
+
+        The padding's hash algorithm.
+
     .. attribute:: mgf
 
         :type: :class:`~cryptography.hazmat.primitives.asymmetric.padding.MGF`
@@ -411,6 +427,14 @@ Mask generation functions
     :param algorithm: An instance of
         :class:`~cryptography.hazmat.primitives.hashes.HashAlgorithm`.
 
+    .. attribute:: algorithm
+
+        :type: :class:`~cryptography.hazmat.primitives.hashes.HashAlgorithm`.
+
+        .. versionadded:: 46.0.0
+
+        The algorithm of this instance.
+
 Numbers
 ~~~~~~~
 

src/cryptography/hazmat/primitives/asymmetric/padding.py

@@ -76,6 +76,10 @@ def __eq__(self, other: typing.Any) -> bool:
     def mgf(self) -> MGF:
         return self._mgf
 
+    @property
+    def salt_length(self) -> int | _MaxLength | _Auto | _DigestLength:
+        return self._salt_length
+
 
 class OAEP(AsymmetricPadding):
     name = "EME-OAEP"
@@ -105,6 +109,10 @@ def __eq__(self, other: typing.Any) -> bool:
     def algorithm(self) -> hashes.HashAlgorithm:
         return self._algorithm
 
+    @property
+    def label(self) -> bytes | None:
+        return self._label
+
     @property
     def mgf(self) -> MGF:
         return self._mgf
@@ -131,6 +139,10 @@ def __init__(self, algorithm: hashes.HashAlgorithm):
     def __eq__(self, other: typing.Any) -> bool:
         return isinstance(other, MGF1) and self._algorithm == other._algorithm
 
+    @property
+    def algorithm(self) -> hashes.HashAlgorithm:
+        return self._algorithm
+
 
 def calculate_max_pss_salt_length(
     key: rsa.RSAPrivateKey | rsa.RSAPublicKey,

tests/hazmat/primitives/test_rsa.py

@@ -1656,6 +1656,13 @@ def test_mgf_property(self):
         assert pss.mgf == mgf
         assert pss.mgf == pss._mgf
 
+    def test_salt_length_property(self):
+        algorithm = hashes.SHA256()
+        mgf = padding.MGF1(algorithm)
+        pss = padding.PSS(mgf=mgf, salt_length=padding.PSS.MAX_LENGTH)
+        assert pss.salt_length == padding.PSS.MAX_LENGTH
+        assert pss._salt_length == padding.PSS.MAX_LENGTH
+
     @pytest.mark.parametrize("xof", [hashes.SHA256(), hashes.SHA512()])
     @pytest.mark.parametrize(
         "salt_length",
@@ -1727,6 +1734,11 @@ def test_valid_mgf1_parameters(self):
         mgf = padding.MGF1(algorithm)
         assert mgf._algorithm == algorithm
 
+    def test_algorithm_property(self):
+        mgf = padding.MGF1(hashes.SHA256())
+        assert mgf.algorithm == hashes.SHA256()
+        assert mgf._algorithm == hashes.SHA256()
+
 
 class TestOAEP:
     def test_invalid_algorithm(self):
@@ -1745,6 +1757,13 @@ def test_algorithm_property(self):
         assert oaep.algorithm == algorithm
         assert oaep.algorithm == oaep._algorithm
 
+    def test_label_property(self):
+        algorithm = hashes.SHA256()
+        mgf = padding.MGF1(algorithm)
+        oaep = padding.OAEP(mgf=mgf, algorithm=algorithm, label=None)
+        assert oaep.label is None
+        assert oaep._label is None
+
     def test_mgf_property(self):
         algorithm = hashes.SHA256()
         mgf = padding.MGF1(algorithm)