commit f04065ade41f03134c6c7cb217f58144d4dd9743
author Joshua Liebow-Feeser <joshlf@google.com> Wed Dec 26 11:07:25 2018 -0500
committer Joshua Liebow-Feeser <joshlf@google.com> Wed Dec 26 11:07:29 2018 -0500
tree 9ff5797fc3dc2f450574a395117ca9e7f979d778
parent 7b28a4400f887d0e5ae3cc9fe5f68646f9f130d1

[public] Clean up tests after 17e7460b

- Fix string names of functions used in tests that were spuriously
  not changed in 17e7460b

Change-Id: Icc88d567181f0f5aa609b04716dd318a7fafbde8

src/public/ec/mod.rs

diff --git a/src/public/ec/mod.rs b/src/public/ec/mod.rs
index 6a0117e..322cdaf 100644
--- a/src/public/ec/mod.rs
+++ b/src/public/ec/mod.rs
@@ -672,22 +672,22 @@
         fn test_parse_invalid<C: PCurve>() {
             should_fail(
                 EcPrivKey::<C>::parse_from_der(&[]),
-                "parse_private_key_der",
+                "EcPrivKey::parse_from_der",
                 "elliptic curve routines:OPENSSL_internal:DECODE_ERROR",
             );
             should_fail(
                 EcPubKey::<C>::parse_from_der(&[]),
-                "parse_public_key_der",
+                "EcPubKey::parse_from_der",
                 "public key routines:OPENSSL_internal:DECODE_ERROR",
             );
             should_fail(
                 EcPrivKeyAnyCurve::parse_from_der(&[]),
-                "parse_private_key_der_any_curve",
+                "EcPrivKeyAnyCurve::parse_from_der",
                 "elliptic curve routines:OPENSSL_internal:DECODE_ERROR",
             );
             should_fail(
                 EcPubKeyAnyCurve::parse_from_der(&[]),
-                "parse_public_key_der_any_curve",
+                "EcPubKeyAnyCurve::parse_from_der",
                 "public key routines:OPENSSL_internal:DECODE_ERROR",
             );
         }
@@ -703,13 +703,13 @@
             let key_der = privkey.marshal_to_der();
             should_fail(
                 EcPrivKey::<C2>::parse_from_der(&key_der),
-                "parse_private_key_der",
+                "EcPrivKey::parse_from_der",
                 "elliptic curve routines:OPENSSL_internal:GROUP_MISMATCH",
             );
             let key_der = privkey.public().marshal_to_der();
             should_fail(
                 EcPubKey::<C2>::parse_from_der(&key_der),
-                "parse_public_key_der",
+                "EcPubKey::parse_from_der",
                 "unexpected curve:",
             );
         }

src/public/mod.rs

diff --git a/src/public/mod.rs b/src/public/mod.rs
index 5233bb0..171e9d4 100644
--- a/src/public/mod.rs
+++ b/src/public/mod.rs
@@ -25,7 +25,11 @@
     /// corresponding to this public key. It is equivalent to
     /// `signature.verify(self, message)`.
     #[must_use]
-    fn verify<S: Signature<PrivateKey = Self::Private>>(&self, message: &[u8], signature: &S) -> bool {
+    fn verify<S: Signature<PrivateKey = Self::Private>>(
+        &self,
+        message: &[u8],
+        signature: &S,
+    ) -> bool {
         signature.verify(self, message)
     }
 }