diff options
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 12 | ||||
| -rw-r--r-- | openssl/Cargo.toml | 2 | ||||
| -rw-r--r-- | openssl/LICENSE | 2 | ||||
| -rw-r--r-- | openssl/src/ec.rs | 18 |
5 files changed, 18 insertions, 20 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 39ef6c53..f20f866a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,10 +68,10 @@ job: &JOB openssl_110: &OPENSSL_110 LIBRARY: openssl - VERSION: 1.1.0f + VERSION: 1.1.0g openssl_102: &OPENSSL_102 LIBRARY: openssl - VERSION: 1.0.2l + VERSION: 1.0.2m openssl_101: &OPENSSL_101 LIBRARY: openssl VERSION: 1.0.1u diff --git a/appveyor.yml b/appveyor.yml index d9ba7558..bae5d621 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,20 +5,20 @@ environment: - TARGET: i686-pc-windows-gnu BITS: 32 MSYS2: 1 - OPENSSL_VERSION: 1_1_0f + OPENSSL_VERSION: 1_1_0g - TARGET: x86_64-pc-windows-msvc BITS: 64 - OPENSSL_VERSION: 1_1_0f + OPENSSL_VERSION: 1_1_0g OPENSSL_DIR: C:\OpenSSL # 1.0.2, 64/32 bit - TARGET: x86_64-pc-windows-gnu BITS: 64 MSYS2: 1 - OPENSSL_VERSION: 1_0_2L + OPENSSL_VERSION: 1_0_2m - TARGET: i686-pc-windows-msvc BITS: 32 - OPENSSL_VERSION: 1_0_2L + OPENSSL_VERSION: 1_0_2m OPENSSL_DIR: C:\OpenSSL - TARGET: x86_64-pc-windows-msvc VCPKG_DEFAULT_TRIPLET: x64-windows @@ -48,7 +48,3 @@ build: false test_script: - cargo run --manifest-path systest/Cargo.toml --target %TARGET% - cargo test --manifest-path openssl/Cargo.toml --target %TARGET% - -cache: - - target - - C:\Users\appveyor\.cargo\registry 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 38c412fc..ddf8c029 100644 --- a/openssl/src/ec.rs +++ b/openssl/src/ec.rs @@ -732,7 +732,7 @@ impl EcKeyBuilderRef { mod test { use bn::{BigNum, BigNumContext}; use nid; - use data_encoding; + use data_encoding::BASE64URL_NOPAD; use super::*; #[test] @@ -811,10 +811,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(); @@ -835,7 +835,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(); @@ -851,11 +851,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(); |