[openssl] master update
shane.lontis at oracle.com
shane.lontis at oracle.com
Fri Sep 20 02:53:40 UTC 2019
The branch master has been updated
via ca392b294359a8e9ca55e685b344b485d02bc93b (commit)
from e7b81fe67a5dd95af72e090fff6fd0749ee88553 (commit)
- Log -----------------------------------------------------------------
commit ca392b294359a8e9ca55e685b344b485d02bc93b
Author: Shane Lontis <shane.lontis at oracle.com>
Date: Wed Jul 10 11:42:03 2019 +1000
Add aes_wrap cipher to providers
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9406)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/evp_enc.c | 6 +
crypto/modes/build.info | 5 +-
providers/common/ciphers/build.info | 2 +-
providers/common/ciphers/cipher_aes_wrp.c | 246 ++++++++++++++++++++++
providers/common/include/internal/provider_algs.h | 7 +
providers/default/defltprov.c | 6 +
providers/fips/fipsprov.c | 24 ++-
7 files changed, 292 insertions(+), 4 deletions(-)
create mode 100644 providers/common/ciphers/cipher_aes_wrp.c
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
diff --git a/providers/common/ciphers/build.info b/providers/common/ciphers/build.info
index 3f303e96b0..0969e6d378 100644
--- a/providers/common/ciphers/build.info
+++ b/providers/common/ciphers/build.info
@@ -11,6 +11,7 @@ $COMMON=cipher_common.c cipher_common_hw.c block.c \
cipher_aes_gcm.c cipher_aes_gcm_hw.c \
cipher_ccm.c cipher_ccm_hw.c \
cipher_aes_ccm.c cipher_aes_ccm_hw.c \
+ cipher_aes_wrp.c \
$COMMON_DES
SOURCE[../../../libcrypto]=$COMMON
@@ -18,4 +19,3 @@ INCLUDE[../../../libcrypto]=. ../../../crypto
SOURCE[../../fips]=$COMMON
INCLUDE[../../fips]=. ../../../crypto
-
diff --git a/providers/common/ciphers/cipher_aes_wrp.c b/providers/common/ciphers/cipher_aes_wrp.c
new file mode 100644
index 0000000000..ae05aed540
--- /dev/null
+++ b/providers/common/ciphers/cipher_aes_wrp.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "cipher_aes.h"
+#include "internal/providercommonerr.h"
+#include "internal/provider_algs.h"
+
+/* AES wrap with padding has IV length of 4, without padding 8 */
+#define AES_WRAP_PAD_IVLEN 4
+#define AES_WRAP_NOPAD_IVLEN 8
+
+/* TODO(3.0) Figure out what flags need to be passed */
+#define WRAP_FLAGS (EVP_CIPH_WRAP_MODE \
+ | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_FLAG_DEFAULT_ASN1)
+
+typedef size_t (*aeswrap_fn)(void *key, const unsigned char *iv,
+ unsigned char *out, const unsigned char *in,
+ size_t inlen, block128_f block);
+
+static OSSL_OP_cipher_encrypt_init_fn aes_wrap_einit;
+static OSSL_OP_cipher_decrypt_init_fn aes_wrap_dinit;
+static OSSL_OP_cipher_update_fn aes_wrap_cipher;
+static OSSL_OP_cipher_final_fn aes_wrap_final;
+static OSSL_OP_cipher_freectx_fn aes_wrap_freectx;
+
+typedef struct prov_aes_wrap_ctx_st {
+ PROV_CIPHER_CTX base;
+ union {
+ OSSL_UNION_ALIGN;
+ AES_KEY ks;
+ } ks;
+ unsigned int iv_set : 1;
+ aeswrap_fn wrapfn;
+
+} PROV_AES_WRAP_CTX;
+
+
+static void *aes_wrap_newctx(size_t kbits, size_t blkbits,
+ size_t ivbits, unsigned int mode, uint64_t flags)
+{
+ PROV_AES_WRAP_CTX *wctx = OPENSSL_zalloc(sizeof(*wctx));
+ PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)wctx;
+
+ if (ctx != NULL) {
+ cipher_generic_initkey(ctx, kbits, blkbits, ivbits, mode, flags,
+ NULL, NULL);
+ ctx->pad = (ctx->ivlen == AES_WRAP_PAD_IVLEN);
+ }
+ return wctx;
+}
+
+static void aes_wrap_freectx(void *vctx)
+{
+ PROV_AES_WRAP_CTX *wctx = (PROV_AES_WRAP_CTX *)vctx;
+ PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
+
+ OPENSSL_cleanse(ctx->iv, sizeof(ctx->iv));
+ OPENSSL_clear_free(wctx, sizeof(*wctx));
+}
+
+static int aes_wrap_init(void *vctx, const unsigned char *key,
+ size_t keylen, const unsigned char *iv,
+ size_t ivlen, int enc)
+{
+ PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
+ PROV_AES_WRAP_CTX *wctx = (PROV_AES_WRAP_CTX *)vctx;
+
+ ctx->enc = enc;
+ ctx->block = enc ? (block128_f)AES_encrypt : (block128_f)AES_decrypt;
+ if (ctx->pad)
+ wctx->wrapfn = enc ? CRYPTO_128_wrap_pad : CRYPTO_128_unwrap_pad;
+ else
+ wctx->wrapfn = enc ? CRYPTO_128_wrap : CRYPTO_128_unwrap;
+
+ if (iv != NULL) {
+ ctx->ivlen = ivlen;
+ memcpy(ctx->iv, iv, ivlen);
+ wctx->iv_set = 1;
+ }
+ if (key != NULL) {
+ if (keylen != ctx->keylen) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
+ return 0;
+ }
+ if (ctx->enc)
+ AES_set_encrypt_key(key, keylen * 8, &wctx->ks.ks);
+ else
+ AES_set_decrypt_key(key, keylen * 8, &wctx->ks.ks);
+ }
+ return 1;
+}
+
+static int aes_wrap_einit(void *ctx, const unsigned char *key, size_t keylen,
+ const unsigned char *iv, size_t ivlen)
+{
+ return aes_wrap_init(ctx, key, keylen, iv, ivlen, 1);
+}
+
+static int aes_wrap_dinit(void *ctx, const unsigned char *key, size_t keylen,
+ const unsigned char *iv, size_t ivlen)
+{
+ return aes_wrap_init(ctx, key, keylen, iv, ivlen, 0);
+}
+
+static int aes_wrap_cipher_internal(void *vctx, unsigned char *out,
+ const unsigned char *in, size_t inlen)
+{
+ PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
+ PROV_AES_WRAP_CTX *wctx = (PROV_AES_WRAP_CTX *)vctx;
+ size_t rv;
+ int pad = ctx->pad;
+
+ /* No final operation so always return zero length */
+ if (in == NULL)
+ return 0;
+
+ /* Input length must always be non-zero */
+ if (inlen == 0)
+ return -1;
+
+ /* If decrypting need at least 16 bytes and multiple of 8 */
+ if (!ctx->enc && (inlen < 16 || inlen & 0x7))
+ return -1;
+
+ /* If not padding input must be multiple of 8 */
+ if (!pad && inlen & 0x7)
+ return -1;
+
+ if (out == NULL) {
+ if (ctx->enc) {
+ /* If padding round up to multiple of 8 */
+ if (pad)
+ inlen = (inlen + 7) / 8 * 8;
+ /* 8 byte prefix */
+ return inlen + 8;
+ } else {
+ /*
+ * If not padding output will be exactly 8 bytes smaller than
+ * input. If padding it will be at least 8 bytes smaller but we
+ * don't know how much.
+ */
+ return inlen - 8;
+ }
+ }
+
+ rv = wctx->wrapfn(&wctx->ks.ks, wctx->iv_set ? ctx->iv : NULL, out, in,
+ inlen, ctx->block);
+ return rv ? (int)rv : -1;
+}
+
+static int aes_wrap_final(void *vctx, unsigned char *out, size_t *outl,
+ size_t outsize)
+{
+ *outl = 0;
+ return 1;
+}
+
+static int aes_wrap_cipher(void *vctx,
+ unsigned char *out, size_t *outl, size_t outsize,
+ const unsigned char *in, size_t inl)
+{
+ PROV_AES_WRAP_CTX *ctx = (PROV_AES_WRAP_CTX *)vctx;
+ size_t len;
+
+ if (outsize < inl) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
+ return -1;
+ }
+
+ len = aes_wrap_cipher_internal(ctx, out, in, inl);
+ if (len == 0)
+ return -1;
+
+ *outl = len;
+ return 1;
+}
+
+static int aes_wrap_set_ctx_params(void *vctx, const OSSL_PARAM params[])
+{
+ PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
+ const OSSL_PARAM *p;
+ size_t keylen = 0;
+
+ p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_KEYLEN);
+ if (p != NULL) {
+ if (!OSSL_PARAM_get_size_t(p, &keylen)) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);
+ return 0;
+ }
+ if (ctx->keylen != keylen) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
+ return 0;
+ }
+ }
+ return 1;
+}
+
+#define IMPLEMENT_cipher(mode, fname, UCMODE, flags, kbits, blkbits, ivbits) \
+ static OSSL_OP_cipher_get_params_fn aes_##kbits##_##fname##_get_params; \
+ static int aes_##kbits##_##fname##_get_params(OSSL_PARAM params[]) \
+ { \
+ return cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, \
+ flags, kbits, blkbits, ivbits); \
+ } \
+ static OSSL_OP_cipher_newctx_fn aes_##kbits##fname##_newctx; \
+ static void *aes_##kbits##fname##_newctx(void *provctx) \
+ { \
+ return aes_##mode##_newctx(kbits, blkbits, ivbits, \
+ EVP_CIPH_##UCMODE##_MODE, flags); \
+ } \
+ const OSSL_DISPATCH aes##kbits##fname##_functions[] = { \
+ { OSSL_FUNC_CIPHER_NEWCTX, \
+ (void (*)(void))aes_##kbits##fname##_newctx }, \
+ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit }, \
+ { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_##mode##_dinit }, \
+ { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_##mode##_cipher }, \
+ { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_##mode##_final }, \
+ { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_##mode##_freectx }, \
+ { OSSL_FUNC_CIPHER_GET_PARAMS, \
+ (void (*)(void))aes_##kbits##_##fname##_get_params }, \
+ { OSSL_FUNC_CIPHER_GETTABLE_PARAMS, \
+ (void (*)(void))cipher_generic_gettable_params }, \
+ { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, \
+ (void (*)(void))cipher_generic_get_ctx_params }, \
+ { OSSL_FUNC_CIPHER_SET_CTX_PARAMS, \
+ (void (*)(void))aes_wrap_set_ctx_params }, \
+ { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS, \
+ (void (*)(void))cipher_generic_gettable_ctx_params }, \
+ { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS, \
+ (void (*)(void))cipher_generic_settable_ctx_params }, \
+ { 0, NULL } \
+ }
+
+IMPLEMENT_cipher(wrap, wrap, WRAP, WRAP_FLAGS, 256, 64, AES_WRAP_NOPAD_IVLEN * 8);
+IMPLEMENT_cipher(wrap, wrap, WRAP, WRAP_FLAGS, 192, 64, AES_WRAP_NOPAD_IVLEN * 8);
+IMPLEMENT_cipher(wrap, wrap, WRAP, WRAP_FLAGS, 128, 64, AES_WRAP_NOPAD_IVLEN * 8);
+IMPLEMENT_cipher(wrap, wrappad, WRAP, WRAP_FLAGS, 256, 64, AES_WRAP_PAD_IVLEN * 8);
+IMPLEMENT_cipher(wrap, wrappad, WRAP, WRAP_FLAGS, 192, 64, AES_WRAP_PAD_IVLEN * 8);
+IMPLEMENT_cipher(wrap, wrappad, WRAP, WRAP_FLAGS, 128, 64, AES_WRAP_PAD_IVLEN * 8);
diff --git a/providers/common/include/internal/provider_algs.h b/providers/common/include/internal/provider_algs.h
index 7c0f437832..3b0a9e4a8e 100644
--- a/providers/common/include/internal/provider_algs.h
+++ b/providers/common/include/internal/provider_algs.h
@@ -69,6 +69,13 @@ extern const OSSL_DISPATCH aes128gcm_functions[];
extern const OSSL_DISPATCH aes256ccm_functions[];
extern const OSSL_DISPATCH aes192ccm_functions[];
extern const OSSL_DISPATCH aes128ccm_functions[];
+extern const OSSL_DISPATCH aes256wrap_functions[];
+extern const OSSL_DISPATCH aes192wrap_functions[];
+extern const OSSL_DISPATCH aes128wrap_functions[];
+extern const OSSL_DISPATCH aes256wrappad_functions[];
+extern const OSSL_DISPATCH aes192wrappad_functions[];
+extern const OSSL_DISPATCH aes128wrappad_functions[];
+
#ifndef OPENSSL_NO_ARIA
extern const OSSL_DISPATCH aria256gcm_functions[];
extern const OSSL_DISPATCH aria192gcm_functions[];
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c
index 3ea0698d1a..9fe7bd35d3 100644
--- a/providers/default/defltprov.c
+++ b/providers/default/defltprov.c
@@ -128,6 +128,12 @@ static const OSSL_ALGORITHM deflt_ciphers[] = {
{ "id-aes256-CCM", "default=yes", aes256ccm_functions },
{ "id-aes192-CCM", "default=yes", aes192ccm_functions },
{ "id-aes128-CCM", "default=yes", aes128ccm_functions },
+ { "id-aes256-wrap", "default=yes", aes256wrap_functions },
+ { "id-aes192-wrap", "default=yes", aes192wrap_functions },
+ { "id-aes128-wrap", "default=yes", aes128wrap_functions },
+ { "id-aes256-wrap-pad", "default=yes", aes256wrappad_functions },
+ { "id-aes192-wrap-pad", "default=yes", aes192wrappad_functions },
+ { "id-aes128-wrap-pad", "default=yes", aes128wrappad_functions },
#ifndef OPENSSL_NO_ARIA
{ "ARIA-256-GCM", "default=yes", aria256gcm_functions },
{ "ARIA-192-GCM", "default=yes", aria192gcm_functions },
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 67ce90ac13..a15ba4d788 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -285,6 +285,22 @@ const char *ossl_prov_util_nid_to_name(int nid)
return "id-aes192-CCM";
case NID_aes_128_ccm:
return "id-aes128-CCM";
+ case NID_id_aes256_wrap:
+ return "id-aes256-wrap";
+ case NID_id_aes192_wrap:
+ return "id-aes192-wrap";
+ case NID_id_aes128_wrap:
+ return "id-aes128-wrap";
+ case NID_id_aes256_wrap_pad:
+ return "id-aes256-wrap-pad";
+ case NID_id_aes192_wrap_pad:
+ return "id-aes192-wrap-pad";
+ case NID_id_aes128_wrap_pad:
+ return "id-aes128-wrap-pad";
+ case NID_des_ede3_ecb:
+ return "DES-EDE3";
+ case NID_des_ede3_cbc:
+ return "DES-EDE3-CBC";
default:
break;
}
@@ -306,7 +322,7 @@ static const OSSL_ALGORITHM fips_digests[] = {
{ "SHA3-512", "fips=yes", sha3_512_functions },
/*
* KECCAK_KMAC128 and KECCAK_KMAC256 as hashes are mostly useful for
- * the KMAC128 and KMAC256.
+ * KMAC128 and KMAC256.
*/
{ "KECCAK_KMAC128", "fips=yes", keccak_kmac_128_functions },
{ "KECCAK_KMAC256", "fips=yes", keccak_kmac_256_functions },
@@ -333,6 +349,12 @@ static const OSSL_ALGORITHM fips_ciphers[] = {
{ "id-aes256-CCM", "fips=yes", aes256ccm_functions },
{ "id-aes192-CCM", "fips=yes", aes192ccm_functions },
{ "id-aes128-CCM", "fips=yes", aes128ccm_functions },
+ { "id-aes256-wrap", "fips=yes", aes256wrap_functions },
+ { "id-aes192-wrap", "fips=yes", aes192wrap_functions },
+ { "id-aes128-wrap", "fips=yes", aes128wrap_functions },
+ { "id-aes256-wrap-pad", "fips=yes", aes256wrappad_functions },
+ { "id-aes192-wrap-pad", "fips=yes", aes192wrappad_functions },
+ { "id-aes128-wrap-pad", "fips=yes", aes128wrappad_functions },
#ifndef OPENSSL_NO_DES
{ "DES-EDE3", "fips=yes", tdes_ede3_ecb_functions },
{ "DES-EDE3-CBC", "fips=yes", tdes_ede3_cbc_functions },
More information about the openssl-commits
mailing list