diff options
| author | davidben <davidben@chromium.org> | 2015-11-18 19:06:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 03:07:25 +0000 |
| commit | 952ee79c0a17c2ed3ceeb4e22b7eafa0da41bbad (patch) | |
| tree | 16fe4d0d9836e8e7884ae9417975277755cb1ebd /crypto/crypto.gypi | |
| parent | 026b848a61b86043b471d694303684781741ed17 (diff) | |
| download | chromium_src-952ee79c0a17c2ed3ceeb4e22b7eafa0da41bbad.zip chromium_src-952ee79c0a17c2ed3ceeb4e22b7eafa0da41bbad.tar.gz chromium_src-952ee79c0a17c2ed3ceeb4e22b7eafa0da41bbad.tar.bz2 | |
Roll src/third_party/boringssl/src d7421ebf6..3ac32b1ed
https://boringssl.googlesource.com/boringssl/+log/d7421ebf6cae07051caf657016f160585b64f8a6..3ac32b1eda0da7a99d9c2b6c605fe50af80ccd90
In doing so, switch crypto/curve25519.h to use the new BoringSSL curve25510
code to avoid shipping two copies. This includes a small subgroup check, so
callers need to be tweaked slightly.
BUG=none
Review URL: https://codereview.chromium.org/1459783002
Cr-Commit-Position: refs/heads/master@{#360507}
Diffstat (limited to 'crypto/crypto.gypi')
| -rw-r--r-- | crypto/crypto.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/crypto.gypi b/crypto/crypto.gypi index 73b3332..e5cc4f44 100644 --- a/crypto/crypto.gypi +++ b/crypto/crypto.gypi @@ -37,9 +37,10 @@ 'crypto_export.h', 'cssm_init.cc', 'cssm_init.h', - 'curve25519.cc', - 'curve25519.h', 'curve25519-donna.c', + 'curve25519.h', + 'curve25519_nss.cc', + 'curve25519_openssl.cc', 'ghash.cc', 'ghash.h', 'ec_private_key.h', |