clean up unnecessary changes

Author: Taowyoo

mbedtls/src/pk/dsa/mod.rs

@@ -217,13 +217,9 @@ fn sample_secret_value<F: Random>(upper_bound: &Mpi, rng: &mut F) -> Result<Mpi>
     Ok(c)
 }
 
-pub fn encode_dsa_signature(r: &Mpi, s: &Mpi) -> Result<Vec<u8>> {
-    serialize_signature(&r.to_binary()?, &s.to_binary()?)
-}
-
-pub fn serialize_signature(r: &[u8], s: &[u8]) -> Result<Vec<u8>> {
-    let r = BigUint::from_bytes_be(r);
-    let s = BigUint::from_bytes_be(s);
+fn encode_dsa_signature(r: &Mpi, s: &Mpi) -> Result<Vec<u8>> {
+    let r = BigUint::from_bytes_be(&r.to_binary()?);
+    let s = BigUint::from_bytes_be(&s.to_binary()?);
 
     Ok(yasna::construct_der(|w| {
         w.write_sequence(|w| {
@@ -233,18 +229,6 @@ pub fn serialize_signature(r: &[u8], s: &[u8]) -> Result<Vec<u8>> {
     }))
 }
 
-pub fn deserialize_signature(signature: &Vec<u8>) -> Result<(Vec<u8>, Vec<u8>)> {
-    let (r,s) = yasna::parse_der(signature, |r| {
-        r.read_sequence(|rdr| {
-            let r = rdr.next().read_biguint()?;
-            let s = rdr.next().read_biguint()?;
-            Ok((r,s))
-        })
-    }).map_err(|_| Error::X509InvalidSignature)?;
-
-    Ok((r.to_bytes_be(), s.to_bytes_be()))
-}
-
 impl DsaPrivateKey {
     pub fn from_components(params: DsaParams, x: Mpi) -> Result<Self> {
         if x <= Mpi::new(1)? || x >= params.q {

mbedtls/src/pk/mod.rs

@@ -211,8 +211,8 @@ define!(
 //       And the key is a const parameter to mbedtls_pk_write_pubkey - ../../../mbedtls-sys/vendor/crypto/library/pkwrite.c:158
 //
 // - Const access with additional notes due to call stacks involved.
-//   ecdsa_sign_wrap: ../../../mbedtls-sys/vendor/crypto/library/pk_wrap.c:657
 //
+//   ecdsa_sign_wrap: ../../../mbedtls-sys/vendor/crypto/library/pk_wrap.c:657
 //       mbedtls_ecdsa_write_signature ../../../mbedtls-sys/vendor/crypto/library/ecdsa.c:688
 //           mbedtls_ecdsa_write_signature_restartable ../../../mbedtls-sys/vendor/crypto/library/ecdsa.c:640
 //               MBEDTLS_ECDSA_DETERMINISTIC is not defined.

mbedtls/src/ssl/context.rs

@@ -565,7 +565,7 @@ impl<T: IoCallback + Write> Write for Context<T> {
 // - no reasonable way to obtain a storage within the sni callback tied to the handshake or to the rust Context. (without resorting to a unscalable map or pointer magic that mbedtls may invalidate)
 //
 impl HandshakeContext {
-    pub fn reset_handshake(&mut self) {
+    fn reset_handshake(&mut self) {
         self.handshake_cert.clear();
         self.handshake_pk.clear();
         self.handshake_ca_cert = None;

mbedtls/src/ssl/mod.rs

@@ -25,4 +25,4 @@ pub use self::cookie::CookieContext;
 pub use self::ticket::TicketContext;
 #[cfg(all(feature = "std", feature = "async"))]
 #[doc(inline)]
-pub use self::context::{AsyncContext};
+pub use self::context::AsyncContext;

mbedtls/src/wrapper_macros.rs

@@ -61,10 +61,6 @@ macro_rules! define {
         define_struct!(define $(#[$m])* struct $name $(lifetime $l)* inner $inner members $($($(#[$mm])* $member: $member_type,)*)*);
         define_struct!(<< $name $(lifetime $l)* inner $inner >> $($defs)*);
     };
-    { #[c_custom_ty($inner:ident)] $(#[$m:meta])* struct $name:ident$(<$l:tt>)* $({ $($(#[$mm:meta])* $member:ident: $member_type:ty,)* })?; $($defs:tt)* } => {
-        define_struct!(define_custom $(#[$m])* struct $name $(lifetime $l)* inner $inner members $($($(#[$mm])* $member: $member_type,)*)*);
-        define_struct!(<< $name $(lifetime $l)* inner $inner >> $($defs)*);
-    };
     // Do not use UnsafeFrom with 'c_box_ty'. That is currently not supported as its not needed anywhere, support may be added in the future if needed anywhere.
     { #[c_box_ty($inner:ident)] $(#[$m:meta])* struct $name:ident$(<$l:tt>)* $({ $($(#[$mm:meta])* $member:ident: $member_type:ty,)* })?; $($defs:tt)* } => {
         define_struct!(define_box $(#[$m])* struct $name $(lifetime $l)* inner $inner members $($($(#[$mm])* $member: $member_type,)*)*);