diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-07-10 03:42:03 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-20 04:33:02 +0200 |
| commit | ca392b294359a8e9ca55e685b344b485d02bc93b (patch) | |
| tree | 9ef95d8ecdaf77b98811f18d7e5f2be19cc72b83 /crypto | |
| parent | Fix missing bn_mul_mont symbol in solaris fips module (diff) | |
| download | openssl-ca392b294359a8e9ca55e685b344b485d02bc93b.tar.xz openssl-ca392b294359a8e9ca55e685b344b485d02bc93b.zip | |
Add aes_wrap cipher to providers
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9406)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/evp_enc.c | 6 | ||||
| -rw-r--r-- | crypto/modes/build.info | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 6e509b2d13..ce1136116c 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -171,6 +171,12 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, case NID_aes_256_gcm: case NID_aes_192_gcm: case NID_aes_128_gcm: + case NID_id_aes256_wrap: + case NID_id_aes256_wrap_pad: + case NID_id_aes192_wrap: + case NID_id_aes192_wrap_pad: + case NID_id_aes128_wrap: + case NID_id_aes128_wrap_pad: case NID_aria_256_gcm: case NID_aria_192_gcm: case NID_aria_128_gcm: diff --git a/crypto/modes/build.info b/crypto/modes/build.info index f5badff1bb..8a8aead651 100644 --- a/crypto/modes/build.info +++ b/crypto/modes/build.info @@ -48,9 +48,10 @@ IF[{- !$disabled{asm} -}] ENDIF ENDIF -$COMMON=cbc128.c ctr128.c cfb128.c ofb128.c gcm128.c ccm128.c xts128.c $MODESASM +$COMMON=cbc128.c ctr128.c cfb128.c ofb128.c gcm128.c ccm128.c xts128.c \ + wrap128.c $MODESASM SOURCE[../../libcrypto]=$COMMON \ - cts128.c wrap128.c ocb128.c siv128.c + cts128.c ocb128.c siv128.c DEFINE[../../libcrypto]=$MODESDEF SOURCE[../../providers/fips]=$COMMON |