Remove deprecated signature::verify API.

briansmith · Jul 16, 2019 · b791dd6 · b791dd6
1 parent dd60763
commit b791dd6
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 69 deletions.
diff --git a/src/signature.rs b/src/signature.rs
@@ -405,17 +405,3 @@ impl<B: AsRef<[u8]>> UnparsedPublicKey<B> {
         )
     }
 }
-
-/// Deprecated. Use [UnparsedPublicKey::verify()].
-///
-/// [UnparsedPublicKey::verify()]: UnparsedPublicKey::verify
-#[deprecated(note = "Use UnparsedPublicKey::verify")]
-pub fn verify(
-    algorithm: &'static dyn VerificationAlgorithm,
-    public_key: untrusted::Input,
-    msg: untrusted::Input,
-    signature: untrusted::Input,
-) -> Result<(), error::Unspecified> {
-    UnparsedPublicKey::new(algorithm, public_key.as_slice_less_safe())
-        .verify(msg.as_slice_less_safe(), signature.as_slice_less_safe())
-}
diff --git a/tests/ecdsa_tests.rs b/tests/ecdsa_tests.rs
@@ -156,15 +156,6 @@ fn signature_ecdsa_verify_asn1_test() {
                 signature::UnparsedPublicKey::new(alg, &public_key).verify(&msg, &sig);
             assert_eq!(actual_result.is_ok(), is_valid);
 
-            #[allow(deprecated)]
-            let actual_result = signature::verify(
-                alg,
-                untrusted::Input::from(&public_key),
-                untrusted::Input::from(&msg),
-                untrusted::Input::from(&sig),
-            );
-            assert_eq!(actual_result.is_ok(), is_valid);
-
             Ok(())
         },
     );
@@ -199,15 +190,6 @@ fn signature_ecdsa_verify_fixed_test() {
                 signature::UnparsedPublicKey::new(alg, &public_key).verify(&msg, &sig);
             assert_eq!(actual_result.is_ok(), is_valid);
 
-            #[allow(deprecated)]
-            let actual_result = signature::verify(
-                alg,
-                untrusted::Input::from(&public_key),
-                untrusted::Input::from(&msg),
-                untrusted::Input::from(&sig),
-            );
-            assert_eq!(actual_result.is_ok(), is_valid);
-
             Ok(())
         },
     );

diff --git a/tests/ed25519_tests.rs b/tests/ed25519_tests.rs
@@ -75,15 +75,6 @@ fn test_signature_ed25519() {
                 .is_ok()
         );
 
-        #[allow(deprecated)]
-        let actual_result = signature::verify(
-            &signature::ED25519,
-            untrusted::Input::from(&public_key),
-            untrusted::Input::from(&msg),
-            untrusted::Input::from(&expected_sig),
-        );
-        assert!(actual_result.is_ok());
-
         let mut tampered_sig = expected_sig;
         tampered_sig[0] ^= 1;
 
@@ -93,15 +84,6 @@ fn test_signature_ed25519() {
                 .is_err()
         );
 
-        #[allow(deprecated)]
-        let actual_result = signature::verify(
-            &signature::ED25519,
-            untrusted::Input::from(&public_key),
-            untrusted::Input::from(&msg),
-            untrusted::Input::from(&tampered_sig),
-        );
-        assert!(actual_result.is_err());
-
         Ok(())
     });
 }

diff --git a/tests/rsa_tests.rs b/tests/rsa_tests.rs
@@ -184,16 +184,6 @@ fn test_signature_rsa_pkcs1_verify() {
                 signature::UnparsedPublicKey::new(alg, &public_key).verify(&msg, &sig);
             assert_eq!(actual_result.is_ok(), is_valid);
 
-            // Deprecated API.
-            #[allow(deprecated)]
-            let actual_result = signature::verify(
-                alg,
-                untrusted::Input::from(&public_key),
-                untrusted::Input::from(&msg),
-                untrusted::Input::from(&sig),
-            );
-            assert_eq!(actual_result.is_ok(), is_valid);
-
             Ok(())
         },
     );
@@ -241,15 +231,6 @@ fn test_signature_rsa_pss_verify() {
                 signature::UnparsedPublicKey::new(alg, &public_key).verify(&msg, &sig);
             assert_eq!(actual_result.is_ok(), is_valid);
 
-            #[allow(deprecated)]
-            let actual_result = signature::verify(
-                alg,
-                untrusted::Input::from(&public_key),
-                untrusted::Input::from(&msg),
-                untrusted::Input::from(&sig),
-            );
-            assert_eq!(actual_result.is_ok(), is_valid);
-
             Ok(())
         },
     );