diff options
| author | Jack Lloyd <[email protected]> | 2017-06-30 11:04:58 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-06-30 11:04:58 -0400 |
| commit | 04effa79a03151cd46bf303b9f72f818e413bef9 (patch) | |
| tree | 6e81d875bb960a123556b1d4877aa180be0149e2 /src | |
| parent | 884fd85a05e055e497a68a5d2b0bd937290bfca4 (diff) | |
Update modern and nist policies with recent additions
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/policy/modern.txt | 7 | ||||
| -rw-r--r-- | src/build-data/policy/nist.txt | 13 | ||||
| -rw-r--r-- | src/lib/misc/cryptobox/info.txt | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/build-data/policy/modern.txt b/src/build-data/policy/modern.txt index c437f05ab..ae6eab938 100644 --- a/src/build-data/policy/modern.txt +++ b/src/build-data/policy/modern.txt @@ -28,6 +28,7 @@ bcrypt # required for private key encryption pbes2 +ed25519 curve25519 ecdh ecdsa @@ -59,6 +60,12 @@ serpent_simd threefish_avx2 chacha_sse2 +sha1_sse2 +sha1_x86 +sha1_armv8 +sha2_32_x86 +sha2_32_armv8 + simd sessions_sql diff --git a/src/build-data/policy/nist.txt b/src/build-data/policy/nist.txt index 447d77b6c..fe5183f15 100644 --- a/src/build-data/policy/nist.txt +++ b/src/build-data/policy/nist.txt @@ -20,8 +20,11 @@ gmac # kdf sp800_108 +sp800_56a sp800_56c +shake + # pk_pad eme_oaep emsa_pssr @@ -47,6 +50,13 @@ rfc3394 aes_ni aes_ssse3 +# hash +sha1_sse2 +sha1_x86 +sha1_armv8 +sha2_32_x86 +sha2_32_armv8 + # modes clmul @@ -85,6 +95,7 @@ noekeon_simd seed serpent serpent_simd +sm4 threefish threefish_avx2 twofish @@ -112,6 +123,7 @@ prf_x942 # pubkey curve25519 +ed25519 ecgdsa eckcdsa elgamal @@ -122,6 +134,7 @@ rfc6979 newhope cecpq1 xmss +sm2 # pk_pad #eme_pkcs1 // needed for tls diff --git a/src/lib/misc/cryptobox/info.txt b/src/lib/misc/cryptobox/info.txt index f69498f72..ba9e752b8 100644 --- a/src/lib/misc/cryptobox/info.txt +++ b/src/lib/misc/cryptobox/info.txt @@ -5,6 +5,7 @@ CRYPTO_BOX -> 20131128 <requires> filters ctr +serpent hmac rng serpent |