diff options
| author | Julien Cretin <[email protected]> | 2017-11-04 18:33:00 +0100 |
|---|---|---|
| committer | Julien Cretin <[email protected]> | 2017-11-04 18:33:00 +0100 |
| commit | a5c582a7dfd419a684ea617ccc5f8aa3090074db (patch) | |
| tree | a06a2827499a5cfef2eefd62c4ca1db40d2e1e55 /openssl | |
| parent | Merge pull request #767 from sfackler/ci-bump (diff) | |
| download | rust-openssl-a5c582a7dfd419a684ea617ccc5f8aa3090074db.tar.xz rust-openssl-a5c582a7dfd419a684ea617ccc5f8aa3090074db.zip | |
Update data-encoding major version
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/Cargo.toml | 2 | ||||
| -rw-r--r-- | openssl/LICENSE | 2 | ||||
| -rw-r--r-- | openssl/src/ec.rs | 18 |
3 files changed, 12 insertions, 10 deletions
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index c93f7581..4f956c8e 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -31,4 +31,4 @@ tempdir = "0.3" winapi = "0.2" ws2_32-sys = "0.2" hex = "0.2" -data-encoding = "1.2" +data-encoding = "2.0" diff --git a/openssl/LICENSE b/openssl/LICENSE index 808903ae..f259067e 100644 --- a/openssl/LICENSE +++ b/openssl/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011 Google Inc. +Copyright 2011-2017 Google Inc. 2013 Jack Lloyd 2013-2014 Steven Fackler diff --git a/openssl/src/ec.rs b/openssl/src/ec.rs index 02be6d22..5e158ae4 100644 --- a/openssl/src/ec.rs +++ b/openssl/src/ec.rs @@ -524,7 +524,7 @@ impl EcKeyBuilderRef { mod test { use bn::{BigNum, BigNumContext}; use nid; - use data_encoding; + use data_encoding::BASE64URL_NOPAD; use super::*; #[test] @@ -603,10 +603,10 @@ mod test { #[test] fn key_from_affine_coordinates() { let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); - let x = data_encoding::base64url::decode_nopad( + let x = BASE64URL_NOPAD.decode( "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes(), ).unwrap(); - let y = data_encoding::base64url::decode_nopad( + let y = BASE64URL_NOPAD.decode( "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(), ).unwrap(); @@ -627,7 +627,7 @@ mod test { #[test] fn set_private_key() { let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); - let d = data_encoding::base64url::decode_nopad( + let d = BASE64URL_NOPAD.decode( "870MB6gfuTJ4HtUnUvYMyJpr5eUZNP4Bk43bVdj3eAE".as_bytes(), ).unwrap(); @@ -643,11 +643,13 @@ mod test { #[test] fn get_affine_coordinates() { - let raw_x = "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4"; - let raw_y = "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM"; let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); - let x = data_encoding::base64url::decode_nopad(raw_x.as_bytes()).unwrap(); - let y = data_encoding::base64url::decode_nopad(raw_y.as_bytes()).unwrap(); + let x = BASE64URL_NOPAD.decode( + "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes(), + ).unwrap(); + let y = BASE64URL_NOPAD.decode( + "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(), + ).unwrap(); let xbn = BigNum::from_slice(&x).unwrap(); let ybn = BigNum::from_slice(&y).unwrap(); |