diff options
| author | Henrik Nord <[email protected]> | 2014-01-17 14:30:48 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-01-17 14:30:58 +0100 |
| commit | 3199b4b663d82d83027fc74c8bf5b6c7849ad1d4 (patch) | |
| tree | 00c95d6a9f0cb67fdb379fd91fc65fce2ff97acd /lib/crypto/src/crypto.app.src | |
| parent | 045fcfc02ace59d07618f8983809236642bba630 (diff) | |
| parent | 8837c1be2ba8a3c123df3f5a87003daa9aac6539 (diff) | |
| download | otp-3199b4b663d82d83027fc74c8bf5b6c7849ad1d4.tar.gz otp-3199b4b663d82d83027fc74c8bf5b6c7849ad1d4.tar.bz2 otp-3199b4b663d82d83027fc74c8bf5b6c7849ad1d4.zip | |
Merge branch 'RoadRunnr/ecdh_crypto'
* RoadRunnr/ecdh_crypto:
crypto: selective support for GF2m curves
ssl: add brainpool elliptic curves to TLS (RFC-7027)
public_key: add brainpool elliptic curves (RFC-5639)
crypto: document ec_curves/0 and ec_curve/1
crypto: add brainpool (RFC 5639) curves
crypto: move elitic curve definitions from OpenSSL built-ins to Erlang
crypto: add ECDH test vectors for more curves
OTP-11578
Diffstat (limited to 'lib/crypto/src/crypto.app.src')
| -rw-r--r-- | lib/crypto/src/crypto.app.src | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/crypto/src/crypto.app.src b/lib/crypto/src/crypto.app.src index 5548b6a1b5..161ea7c9fe 100644 --- a/lib/crypto/src/crypto.app.src +++ b/lib/crypto/src/crypto.app.src @@ -20,6 +20,7 @@ [{description, "CRYPTO version 2"}, {vsn, "%VSN%"}, {modules, [crypto, + crypto_ec_curves, crypto_app, crypto_sup, crypto_server]}, |