From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- src/crypto/err/dsa.errordata | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/crypto/err/dsa.errordata') diff --git a/src/crypto/err/dsa.errordata b/src/crypto/err/dsa.errordata index c2dff23..3c5764a 100644 --- a/src/crypto/err/dsa.errordata +++ b/src/crypto/err/dsa.errordata @@ -1,9 +1,4 @@ -DSA,function,100,DSA_new_method -DSA,function,101,dsa_sig_cb -DSA,function,102,sign -DSA,function,103,sign_setup -DSA,function,104,verify -DSA,reason,100,BAD_Q_VALUE -DSA,reason,101,MISSING_PARAMETERS -DSA,reason,102,MODULUS_TOO_LARGE -DSA,reason,103,NEED_NEW_SETUP_VALUES +DSA,100,BAD_Q_VALUE +DSA,101,MISSING_PARAMETERS +DSA,102,MODULUS_TOO_LARGE +DSA,103,NEED_NEW_SETUP_VALUES -- cgit v1.1 From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 00:26:37 +0000 Subject: Revert "external/boringssl: sync with upstream." This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25 --- src/crypto/err/dsa.errordata | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/crypto/err/dsa.errordata') diff --git a/src/crypto/err/dsa.errordata b/src/crypto/err/dsa.errordata index 3c5764a..c2dff23 100644 --- a/src/crypto/err/dsa.errordata +++ b/src/crypto/err/dsa.errordata @@ -1,4 +1,9 @@ -DSA,100,BAD_Q_VALUE -DSA,101,MISSING_PARAMETERS -DSA,102,MODULUS_TOO_LARGE -DSA,103,NEED_NEW_SETUP_VALUES +DSA,function,100,DSA_new_method +DSA,function,101,dsa_sig_cb +DSA,function,102,sign +DSA,function,103,sign_setup +DSA,function,104,verify +DSA,reason,100,BAD_Q_VALUE +DSA,reason,101,MISSING_PARAMETERS +DSA,reason,102,MODULUS_TOO_LARGE +DSA,reason,103,NEED_NEW_SETUP_VALUES -- cgit v1.1 From b8494591d1b1a143f3b192d845c238bbf3bc629d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 02:29:14 +0000 Subject: Revert "Revert "external/boringssl: sync with upstream."" This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88 --- src/crypto/err/dsa.errordata | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/crypto/err/dsa.errordata') diff --git a/src/crypto/err/dsa.errordata b/src/crypto/err/dsa.errordata index c2dff23..3c5764a 100644 --- a/src/crypto/err/dsa.errordata +++ b/src/crypto/err/dsa.errordata @@ -1,9 +1,4 @@ -DSA,function,100,DSA_new_method -DSA,function,101,dsa_sig_cb -DSA,function,102,sign -DSA,function,103,sign_setup -DSA,function,104,verify -DSA,reason,100,BAD_Q_VALUE -DSA,reason,101,MISSING_PARAMETERS -DSA,reason,102,MODULUS_TOO_LARGE -DSA,reason,103,NEED_NEW_SETUP_VALUES +DSA,100,BAD_Q_VALUE +DSA,101,MISSING_PARAMETERS +DSA,102,MODULUS_TOO_LARGE +DSA,103,NEED_NEW_SETUP_VALUES -- cgit v1.1