min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update data-encoding major version

This commit is contained in:
Julien Cretin 2017-11-04 18:33:00 +01:00
parent bc38213d9c
commit a5c582a7df
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openssl/Cargo.toml
View File

@ -31,4 +31,4 @@ tempdir = "0.3"
winapi = "0.2" winapi = "0.2"
ws2_32-sys = "0.2" ws2_32-sys = "0.2"
hex = "0.2" hex = "0.2"
data-encoding = "1.2" data-encoding = "2.0"

2
openssl/LICENSE
View File

@ -1,4 +1,4 @@
Copyright 2011 Google Inc. Copyright 2011-2017 Google Inc.
2013 Jack Lloyd 2013 Jack Lloyd
2013-2014 Steven Fackler 2013-2014 Steven Fackler

18
openssl/src/ec.rs
View File

@ -524,7 +524,7 @@ impl EcKeyBuilderRef {
mod test { mod test {
use bn::{BigNum, BigNumContext}; use bn::{BigNum, BigNumContext};
use nid; use nid;
use data_encoding; use data_encoding::BASE64URL_NOPAD;
use super::*; use super::*;
#[test] #[test]
@ -603,10 +603,10 @@ mod test {
#[test] #[test]
fn key_from_affine_coordinates() { fn key_from_affine_coordinates() {
let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); 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(), "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes(),
).unwrap(); ).unwrap();
let y = data_encoding::base64url::decode_nopad( let y = BASE64URL_NOPAD.decode(
"4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(), "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(),
).unwrap(); ).unwrap();
@ -627,7 +627,7 @@ mod test {
#[test] #[test]
fn set_private_key() { fn set_private_key() {
let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); 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(), "870MB6gfuTJ4HtUnUvYMyJpr5eUZNP4Bk43bVdj3eAE".as_bytes(),
).unwrap(); ).unwrap();
@ -643,11 +643,13 @@ mod test {
#[test] #[test]
fn get_affine_coordinates() { fn get_affine_coordinates() {
let raw_x = "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4";
let raw_y = "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM";
let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap();
let x = data_encoding::base64url::decode_nopad(raw_x.as_bytes()).unwrap(); let x = BASE64URL_NOPAD.decode(
let y = data_encoding::base64url::decode_nopad(raw_y.as_bytes()).unwrap(); "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes(),
).unwrap();
let y = BASE64URL_NOPAD.decode(
"4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(),
).unwrap();
let xbn = BigNum::from_slice(&x).unwrap(); let xbn = BigNum::from_slice(&x).unwrap();
let ybn = BigNum::from_slice(&y).unwrap(); let ybn = BigNum::from_slice(&y).unwrap();