AEAD support.
[openssl.git] / crypto / evp / e_aes.c
index 1e4af0cb7511e598b9d371e669722769e2b275ef..463de1cfe651a9f67a756d1361271dfd8fe01709 100644 (file)
 #include <assert.h>
 #include <openssl/aes.h>
 #include "evp_locl.h"
-#ifndef OPENSSL_FIPS
 #include "modes_lcl.h"
 #include <openssl/rand.h>
 
+#ifndef OPENSSL_FIPSCANISTER
+#undef EVP_CIPH_FLAG_FIPS
+#define EVP_CIPH_FLAG_FIPS 0
+#endif
+
 typedef struct
        {
-       AES_KEY ks;
+       union { double align; AES_KEY ks; } ks;
        block128_f block;
        union {
                cbc128_f cbc;
@@ -72,7 +76,7 @@ typedef struct
 
 typedef struct
        {
-       AES_KEY ks;             /* AES key schedule to use */
+       union { double align; AES_KEY ks; } ks; /* AES key schedule to use */
        int key_set;            /* Set if key initialised */
        int iv_set;             /* Set if an iv is set */
        GCM128_CONTEXT gcm;
@@ -86,7 +90,7 @@ typedef struct
 
 typedef struct
        {
-       AES_KEY ks1, ks2;       /* AES key schedules to use */
+       union { double align; AES_KEY ks; } ks1, ks2;   /* AES key schedules to use */
        XTS128_CONTEXT xts;
        void     (*stream)(const unsigned char *in,
                        unsigned char *out, size_t length,
@@ -96,7 +100,7 @@ typedef struct
 
 typedef struct
        {
-       AES_KEY ks;             /* AES key schedule to use */
+       union { double align; AES_KEY ks; } ks; /* AES key schedule to use */
        int key_set;            /* Set if key initialised */
        int iv_set;             /* Set if an iv is set */
        int tag_set;            /* Set if tag is valid */
@@ -160,7 +164,7 @@ void AES_xts_decrypt(const char *inp,char *out,size_t len,
        defined(_M_AMD64)       || defined(_M_X64)      || \
        defined(__INTEL__)                              )
 
-extern unsigned int OPENSSL_ia32cap_P[2];
+extern unsigned int OPENSSL_ia32cap_P[];
 
 #ifdef VPAES_ASM
 #define VPAES_CAPABLE  (OPENSSL_ia32cap_P[1]&(1<<(41-32)))
@@ -226,6 +230,29 @@ void aesni_ccm64_decrypt_blocks (const unsigned char *in,
                        const unsigned char ivec[16],
                        unsigned char cmac[16]);
 
+#if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+size_t aesni_gcm_encrypt(const unsigned char *in,
+                       unsigned char *out,
+                       size_t len,
+                       const void *key,
+                       unsigned char ivec[16],
+                       u64 *Xi);
+#define AES_gcm_encrypt        aesni_gcm_encrypt
+size_t aesni_gcm_decrypt(const unsigned char *in,
+                       unsigned char *out,
+                       size_t len,
+                       const void *key,
+                       unsigned char ivec[16],
+                       u64 *Xi);
+#define AES_gcm_decrypt        aesni_gcm_decrypt
+void gcm_ghash_avx(u64 Xi[2],const u128 Htable[16],const u8 *in,size_t len);
+#define AES_GCM_ASM(gctx)      (gctx->ctr==aesni_ctr32_encrypt_blocks && \
+                                gctx->gcm.ghash==gcm_ghash_avx)
+#define AES_GCM_ASM2(gctx)     (gctx->gcm.block==(block128_f)aesni_encrypt && \
+                                gctx->gcm.ghash==gcm_ghash_avx)
+#undef AES_GCM_ASM2            /* minor size optimization */
+#endif
+
 static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                   const unsigned char *iv, int enc)
        {
@@ -310,7 +337,7 @@ static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                return 1;
        if (key)
                {
-               aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
+               aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks);
                CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
                                (block128_f)aesni_encrypt);
                gctx->ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
@@ -355,19 +382,19 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                /* key_len is two AES keys */
                if (enc)
                        {
-                       aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                       aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
                        xctx->xts.block1 = (block128_f)aesni_encrypt;
                        xctx->stream = aesni_xts_encrypt;
                        }
                else
                        {
-                       aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                       aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
                        xctx->xts.block1 = (block128_f)aesni_decrypt;
                        xctx->stream = aesni_xts_decrypt;
                        }
 
                aesni_set_encrypt_key(key + ctx->key_len/2,
-                                               ctx->key_len * 4, &xctx->ks2);
+                                               ctx->key_len * 4, &xctx->ks2.ks);
                xctx->xts.block2 = (block128_f)aesni_encrypt;
 
                xctx->xts.key1 = &xctx->ks1;
@@ -394,7 +421,7 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                return 1;
        if (key)
                {
-               aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
+               aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks);
                CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
                                        &cctx->ks, (block128_f)aesni_encrypt);
                cctx->str = enc?(ccm128_f)aesni_ccm64_encrypt_blocks :
@@ -456,6 +483,392 @@ static const EVP_CIPHER aes_##keylen##_##mode = { \
 const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
 { return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
 
+#elif  defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+
+#include "sparc_arch.h"
+
+extern unsigned int OPENSSL_sparcv9cap_P[];
+
+#define        SPARC_AES_CAPABLE       (OPENSSL_sparcv9cap_P[1] & CFR_AES)
+
+void   aes_t4_set_encrypt_key (const unsigned char *key, int bits,
+                               AES_KEY *ks);
+void   aes_t4_set_decrypt_key (const unsigned char *key, int bits,
+                               AES_KEY *ks);
+void   aes_t4_encrypt (const unsigned char *in, unsigned char *out,
+                               const AES_KEY *key);
+void   aes_t4_decrypt (const unsigned char *in, unsigned char *out,
+                               const AES_KEY *key);
+/*
+ * Key-length specific subroutines were chosen for following reason.
+ * Each SPARC T4 core can execute up to 8 threads which share core's
+ * resources. Loading as much key material to registers allows to
+ * minimize references to shared memory interface, as well as amount
+ * of instructions in inner loops [much needed on T4]. But then having
+ * non-key-length specific routines would require conditional branches
+ * either in inner loops or on subroutines' entries. Former is hardly
+ * acceptable, while latter means code size increase to size occupied
+ * by multiple key-length specfic subroutines, so why fight?
+ */
+void   aes128_t4_cbc_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t len, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes128_t4_cbc_decrypt (const unsigned char *in, unsigned char *out,
+                               size_t len, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes192_t4_cbc_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t len, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes192_t4_cbc_decrypt (const unsigned char *in, unsigned char *out,
+                               size_t len, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes256_t4_cbc_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t len, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes256_t4_cbc_decrypt (const unsigned char *in, unsigned char *out,
+                               size_t len, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes128_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes192_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes256_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key,
+                               unsigned char *ivec);
+void   aes128_t4_xts_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key1,
+                               const AES_KEY *key2, const unsigned char *ivec);
+void   aes128_t4_xts_decrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key1,
+                               const AES_KEY *key2, const unsigned char *ivec);
+void   aes256_t4_xts_encrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key1,
+                               const AES_KEY *key2, const unsigned char *ivec);
+void   aes256_t4_xts_decrypt (const unsigned char *in, unsigned char *out,
+                               size_t blocks, const AES_KEY *key1,
+                               const AES_KEY *key2, const unsigned char *ivec);
+
+static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                  const unsigned char *iv, int enc)
+       {
+       int ret, mode, bits;
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       mode = ctx->cipher->flags & EVP_CIPH_MODE;
+       bits = ctx->key_len*8;
+       if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
+           && !enc)
+               {
+                   ret = 0;
+                   aes_t4_set_decrypt_key(key, bits, ctx->cipher_data);
+                   dat->block  = (block128_f)aes_t4_decrypt;
+                   switch (bits) {
+                   case 128:
+                       dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                               (cbc128_f)aes128_t4_cbc_decrypt :
+                                               NULL;
+                       break;
+                   case 192:
+                       dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                               (cbc128_f)aes192_t4_cbc_decrypt :
+                                               NULL;
+                       break;
+                   case 256:
+                       dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                               (cbc128_f)aes256_t4_cbc_decrypt :
+                                               NULL;
+                       break;
+                   default:
+                       ret = -1;
+                   }
+               }
+       else    {
+                   ret = 0;
+                   aes_t4_set_encrypt_key(key, bits, ctx->cipher_data);
+                   dat->block  = (block128_f)aes_t4_encrypt;
+                   switch (bits) {
+                   case 128:
+                       if (mode==EVP_CIPH_CBC_MODE)
+                               dat->stream.cbc = (cbc128_f)aes128_t4_cbc_encrypt;
+                       else if (mode==EVP_CIPH_CTR_MODE)
+                               dat->stream.ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
+                       else
+                               dat->stream.cbc = NULL;
+                       break;
+                   case 192:
+                       if (mode==EVP_CIPH_CBC_MODE)
+                               dat->stream.cbc = (cbc128_f)aes192_t4_cbc_encrypt;
+                       else if (mode==EVP_CIPH_CTR_MODE)
+                               dat->stream.ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
+                       else
+                               dat->stream.cbc = NULL;
+                       break;
+                   case 256:
+                       if (mode==EVP_CIPH_CBC_MODE)
+                               dat->stream.cbc = (cbc128_f)aes256_t4_cbc_encrypt;
+                       else if (mode==EVP_CIPH_CTR_MODE)
+                               dat->stream.ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
+                       else
+                               dat->stream.cbc = NULL;
+                       break;
+                   default:
+                       ret = -1;
+                   }
+               }
+
+       if(ret < 0)
+               {
+               EVPerr(EVP_F_AES_T4_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);
+               return 0;
+               }
+
+       return 1;
+       }
+
+#define aes_t4_cbc_cipher aes_cbc_cipher
+static int aes_t4_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in, size_t len);
+
+#define aes_t4_ecb_cipher aes_ecb_cipher 
+static int aes_t4_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in, size_t len);
+
+#define aes_t4_ofb_cipher aes_ofb_cipher
+static int aes_t4_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len);
+
+#define aes_t4_cfb_cipher aes_cfb_cipher
+static int aes_t4_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len);
+
+#define aes_t4_cfb8_cipher aes_cfb8_cipher
+static int aes_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len);
+
+#define aes_t4_cfb1_cipher aes_cfb1_cipher
+static int aes_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len);
+
+#define aes_t4_ctr_cipher aes_ctr_cipher
+static int aes_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len);
+
+static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+       {
+       EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
+               {
+               int bits = ctx->key_len * 8;
+               aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks);
+               CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
+                               (block128_f)aes_t4_encrypt);
+               switch (bits) {
+                   case 128:
+                       gctx->ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
+                       break;
+                   case 192:
+                       gctx->ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
+                       break;
+                   case 256:
+                       gctx->ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
+                       break;
+                   default:
+                       return 0;
+               }
+               /* If we have an iv can set it directly, otherwise use
+                * saved IV.
+                */
+               if (iv == NULL && gctx->iv_set)
+                       iv = gctx->iv;
+               if (iv)
+                       {
+                       CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
+                       gctx->iv_set = 1;
+                       }
+               gctx->key_set = 1;
+               }
+       else
+               {
+               /* If key set use IV, otherwise copy */
+               if (gctx->key_set)
+                       CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
+               else
+                       memcpy(gctx->iv, iv, gctx->ivlen);
+               gctx->iv_set = 1;
+               gctx->iv_gen = 0;
+               }
+       return 1;
+       }
+
+#define aes_t4_gcm_cipher aes_gcm_cipher
+static int aes_t4_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len);
+
+static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+       {
+       EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+
+       if (key)
+               {
+               int bits = ctx->key_len * 4;
+               xctx->stream = NULL;
+               /* key_len is two AES keys */
+               if (enc)
+                       {
+                       aes_t4_set_encrypt_key(key, bits, &xctx->ks1.ks);
+                       xctx->xts.block1 = (block128_f)aes_t4_encrypt;
+                       switch (bits) {
+                           case 128:
+                               xctx->stream = aes128_t4_xts_encrypt;
+                               break;
+#if 0 /* not yet */
+                           case 192:
+                               xctx->stream = aes192_t4_xts_encrypt;
+                               break;
+#endif
+                           case 256:
+                               xctx->stream = aes256_t4_xts_encrypt;
+                               break;
+                           default:
+                               return 0;
+                           }
+                       }
+               else
+                       {
+                       aes_t4_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
+                       xctx->xts.block1 = (block128_f)aes_t4_decrypt;
+                       switch (bits) {
+                           case 128:
+                               xctx->stream = aes128_t4_xts_decrypt;
+                               break;
+#if 0 /* not yet */
+                           case 192:
+                               xctx->stream = aes192_t4_xts_decrypt;
+                               break;
+#endif
+                           case 256:
+                               xctx->stream = aes256_t4_xts_decrypt;
+                               break;
+                           default:
+                               return 0;
+                           }
+                       }
+
+               aes_t4_set_encrypt_key(key + ctx->key_len/2,
+                                               ctx->key_len * 4, &xctx->ks2.ks);
+               xctx->xts.block2 = (block128_f)aes_t4_encrypt;
+
+               xctx->xts.key1 = &xctx->ks1;
+               }
+
+       if (iv)
+               {
+               xctx->xts.key2 = &xctx->ks2;
+               memcpy(ctx->iv, iv, 16);
+               }
+
+       return 1;
+       }
+
+#define aes_t4_xts_cipher aes_xts_cipher
+static int aes_t4_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len);
+
+static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+       {
+       EVP_AES_CCM_CTX *cctx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
+               {
+               int bits = ctx->key_len * 8;
+               aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks);
+               CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
+                                       &cctx->ks, (block128_f)aes_t4_encrypt);
+#if 0 /* not yet */
+               switch (bits) {
+                   case 128:
+                       cctx->str = enc?(ccm128_f)aes128_t4_ccm64_encrypt :
+                               (ccm128_f)ae128_t4_ccm64_decrypt;
+                       break;
+                   case 192:
+                       cctx->str = enc?(ccm128_f)aes192_t4_ccm64_encrypt :
+                               (ccm128_f)ae192_t4_ccm64_decrypt;
+                       break;
+                   case 256:
+                       cctx->str = enc?(ccm128_f)aes256_t4_ccm64_encrypt :
+                               (ccm128_f)ae256_t4_ccm64_decrypt;
+                       break;
+                   default:
+                       return 0;
+                   }
+#endif
+               cctx->key_set = 1;
+               }
+       if (iv)
+               {
+               memcpy(ctx->iv, iv, 15 - cctx->L);
+               cctx->iv_set = 1;
+               }
+       return 1;
+       }
+
+#define aes_t4_ccm_cipher aes_ccm_cipher
+static int aes_t4_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len);
+
+#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
+static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
+       nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
+       flags|EVP_CIPH_##MODE##_MODE,   \
+       aes_t4_init_key,                \
+       aes_t4_##mode##_cipher,         \
+       NULL,                           \
+       sizeof(EVP_AES_KEY),            \
+       NULL,NULL,NULL,NULL }; \
+static const EVP_CIPHER aes_##keylen##_##mode = { \
+       nid##_##keylen##_##nmode,blocksize,     \
+       keylen/8,ivlen, \
+       flags|EVP_CIPH_##MODE##_MODE,   \
+       aes_init_key,                   \
+       aes_##mode##_cipher,            \
+       NULL,                           \
+       sizeof(EVP_AES_KEY),            \
+       NULL,NULL,NULL,NULL }; \
+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
+
+#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
+static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
+       nid##_##keylen##_##mode,blocksize, \
+       (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
+       flags|EVP_CIPH_##MODE##_MODE,   \
+       aes_t4_##mode##_init_key,       \
+       aes_t4_##mode##_cipher,         \
+       aes_##mode##_cleanup,           \
+       sizeof(EVP_AES_##MODE##_CTX),   \
+       NULL,NULL,aes_##mode##_ctrl,NULL }; \
+static const EVP_CIPHER aes_##keylen##_##mode = { \
+       nid##_##keylen##_##mode,blocksize, \
+       (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
+       flags|EVP_CIPH_##MODE##_MODE,   \
+       aes_##mode##_init_key,          \
+       aes_##mode##_cipher,            \
+       aes_##mode##_cleanup,           \
+       sizeof(EVP_AES_##MODE##_CTX),   \
+       NULL,NULL,aes_##mode##_ctrl,NULL }; \
+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
+
 #else
 
 #define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
@@ -505,7 +918,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef BSAES_CAPABLE
            if (BSAES_CAPABLE && mode==EVP_CIPH_CBC_MODE)
                {
-               ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
+               ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks.ks);
                dat->block      = (block128_f)AES_decrypt;
                dat->stream.cbc = (cbc128_f)bsaes_cbc_encrypt;
                }
@@ -514,7 +927,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef VPAES_CAPABLE
            if (VPAES_CAPABLE)
                {
-               ret = vpaes_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
+               ret = vpaes_set_decrypt_key(key,ctx->key_len*8,&dat->ks.ks);
                dat->block      = (block128_f)vpaes_decrypt;
                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
                                        (cbc128_f)vpaes_cbc_encrypt :
@@ -523,7 +936,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
            else
 #endif
                {
-               ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
+               ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks.ks);
                dat->block      = (block128_f)AES_decrypt;
                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
                                        (cbc128_f)AES_cbc_encrypt :
@@ -533,7 +946,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef BSAES_CAPABLE
            if (BSAES_CAPABLE && mode==EVP_CIPH_CTR_MODE)
                {
-               ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
+               ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks.ks);
                dat->block      = (block128_f)AES_encrypt;
                dat->stream.ctr = (ctr128_f)bsaes_ctr32_encrypt_blocks;
                }
@@ -542,7 +955,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef VPAES_CAPABLE
            if (VPAES_CAPABLE)
                {
-               ret = vpaes_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
+               ret = vpaes_set_encrypt_key(key,ctx->key_len*8,&dat->ks.ks);
                dat->block      = (block128_f)vpaes_encrypt;
                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
                                        (cbc128_f)vpaes_cbc_encrypt :
@@ -551,7 +964,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
            else
 #endif
                {
-               ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
+               ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks.ks);
                dat->block      = (block128_f)AES_encrypt;
                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
                                        (cbc128_f)AES_cbc_encrypt :
@@ -715,7 +1128,7 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
        case EVP_CTRL_GCM_SET_IVLEN:
                if (arg <= 0)
                        return 0;
-#ifdef OPENSSL_FIPS
+#ifdef OPENSSL_FIPSCANISTER
                if (FIPS_module_mode() && !(c->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW)
                                                 && arg < 12)
                        return 0;
@@ -814,44 +1227,48 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
                }
        }
 
-static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc)
+static ctr128_f aes_gcm_set_key(AES_KEY *aes_key, GCM128_CONTEXT *gcm_ctx,
+                               const unsigned char *key, size_t key_len)
        {
-       EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
-       if (!iv && !key)
-               return 1;
-       if (key)
-               { do {
 #ifdef BSAES_CAPABLE
                if (BSAES_CAPABLE)
                        {
-                       AES_set_encrypt_key(key,ctx->key_len*8,&gctx->ks);
-                       CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
+                       AES_set_encrypt_key(key,key_len*8,aes_key);
+                       CRYPTO_gcm128_init(gcm_ctx,aes_key,
                                        (block128_f)AES_encrypt);
-                       gctx->ctr = (ctr128_f)bsaes_ctr32_encrypt_blocks;
-                       break;
+                       return (ctr128_f)bsaes_ctr32_encrypt_blocks;
                        }
-               else
 #endif
 #ifdef VPAES_CAPABLE
                if (VPAES_CAPABLE)
                        {
-                       vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks);
-                       CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
+                       vpaes_set_encrypt_key(key,key_len*8,aes_key);
+                       CRYPTO_gcm128_init(gcm_ctx,aes_key,
                                        (block128_f)vpaes_encrypt);
-                       gctx->ctr = NULL;
-                       break;
+                       return NULL;
                        }
+               else
 #endif
-               AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
-               CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt);
+               (void)0;        /* terminate potentially open 'else' */
+
+       AES_set_encrypt_key(key, key_len*8, aes_key);
+       CRYPTO_gcm128_init(gcm_ctx, aes_key, (block128_f)AES_encrypt);
 #ifdef AES_CTR_ASM
-               gctx->ctr = (ctr128_f)AES_ctr32_encrypt;
+       return (ctr128_f)AES_ctr32_encrypt;
 #else
-               gctx->ctr = NULL;
+       return NULL;
 #endif
-               } while (0);
+       }
 
+static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+       {
+       EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
+               {
+               gctx->ctr = aes_gcm_set_key(&gctx->ks.ks, &gctx->gcm, key, ctx->key_len);
                /* If we have an iv can set it directly, otherwise use
                 * saved IV.
                 */
@@ -910,13 +1327,46 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                /* Encrypt payload */
                if (gctx->ctr)
                        {
+                       size_t bulk=0;
+#if defined(AES_GCM_ASM)
+                       if (len>=32 && AES_GCM_ASM(gctx))
+                               {
+                               if (CRYPTO_gcm128_encrypt(&gctx->gcm,NULL,NULL,0))
+                                       return -1;
+
+                               bulk = AES_gcm_encrypt(in,out,len,
+                                                       gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                               gctx->gcm.len.u[1] += bulk;
+                               }
+#endif
                        if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
-                                                       in, out, len,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk,
                                                        gctx->ctr))
                                goto err;
                        }
                else    {
-                       if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len))
+                       size_t bulk=0;
+#if defined(AES_GCM_ASM2)
+                       if (len>=32 && AES_GCM_ASM2(gctx))
+                               {
+                               if (CRYPTO_gcm128_encrypt(&gctx->gcm,NULL,NULL,0))
+                                       return -1;
+
+                               bulk = AES_gcm_encrypt(in,out,len,
+                                                       gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                               gctx->gcm.len.u[1] += bulk;
+                               }
+#endif
+                       if (CRYPTO_gcm128_encrypt(&gctx->gcm,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk))
                                goto err;
                        }
                out += len;
@@ -929,13 +1379,46 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                /* Decrypt */
                if (gctx->ctr)
                        {
+                       size_t bulk=0;
+#if defined(AES_GCM_ASM)
+                       if (len>=16 && AES_GCM_ASM(gctx))
+                               {
+                               if (CRYPTO_gcm128_decrypt(&gctx->gcm,NULL,NULL,0))
+                                       return -1;
+
+                               bulk = AES_gcm_decrypt(in,out,len,
+                                                       gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                               gctx->gcm.len.u[1] += bulk;
+                               }
+#endif
                        if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
-                                                       in, out, len,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk,
                                                        gctx->ctr))
                                goto err;
                        }
                else    {
-                       if (CRYPTO_gcm128_decrypt(&gctx->gcm, in, out, len))
+                       size_t bulk=0;
+#if defined(AES_GCM_ASM2)
+                       if (len>=16 && AES_GCM_ASM2(gctx))
+                               {
+                               if (CRYPTO_gcm128_decrypt(&gctx->gcm,NULL,NULL,0))
+                                       return -1;
+
+                               bulk = AES_gcm_decrypt(in,out,len,
+                                                       gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                               gctx->gcm.len.u[1] += bulk;
+                               }
+#endif
+                       if (CRYPTO_gcm128_decrypt(&gctx->gcm,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk))
                                goto err;
                        }
                /* Retrieve tag */
@@ -969,8 +1452,6 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
        if (!gctx->iv_set)
                return -1;
-       if (!ctx->encrypt && gctx->taglen < 0)
-               return -1;
        if (in)
                {
                if (out == NULL)
@@ -982,13 +1463,54 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                        {
                        if (gctx->ctr)
                                {
+                               size_t bulk=0;
+#if defined(AES_GCM_ASM)
+                               if (len>=32 && AES_GCM_ASM(gctx))
+                                       {
+                                       size_t res = (16-gctx->gcm.mres)%16;
+
+                                       if (CRYPTO_gcm128_encrypt(&gctx->gcm,
+                                                       in,out,res))
+                                               return -1;
+
+                                       bulk = AES_gcm_encrypt(in+res,
+                                                       out+res,len-res,                                                                gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                                       gctx->gcm.len.u[1] += bulk;
+                                       bulk += res;
+                                       }
+#endif
                                if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
-                                                       in, out, len,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk,
                                                        gctx->ctr))
                                        return -1;
                                }
                        else    {
-                               if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len))
+                               size_t bulk=0;
+#if defined(AES_GCM_ASM2)
+                               if (len>=32 && AES_GCM_ASM2(gctx))
+                                       {
+                                       size_t res = (16-gctx->gcm.mres)%16;
+
+                                       if (CRYPTO_gcm128_encrypt(&gctx->gcm,
+                                                       in,out,res))
+                                               return -1;
+
+                                       bulk = AES_gcm_encrypt(in+res,
+                                                       out+res,len-res,                                                                gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                                       gctx->gcm.len.u[1] += bulk;
+                                       bulk += res;
+                                       }
+#endif
+                               if (CRYPTO_gcm128_encrypt(&gctx->gcm,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk))
                                        return -1;
                                }
                        }
@@ -996,13 +1518,56 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                        {
                        if (gctx->ctr)
                                {
+                               size_t bulk=0;
+#if defined(AES_GCM_ASM)
+                               if (len>=16 && AES_GCM_ASM(gctx))
+                                       {
+                                       size_t res = (16-gctx->gcm.mres)%16;
+
+                                       if (CRYPTO_gcm128_decrypt(&gctx->gcm,
+                                                       in,out,res))
+                                               return -1;
+
+                                       bulk = AES_gcm_decrypt(in+res,
+                                                       out+res,len-res,
+                                                       gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                                       gctx->gcm.len.u[1] += bulk;
+                                       bulk += res;
+                                       }
+#endif
                                if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
-                                                       in, out, len,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk,
                                                        gctx->ctr))
                                        return -1;
                                }
                        else    {
-                               if (CRYPTO_gcm128_decrypt(&gctx->gcm, in, out, len))
+                               size_t bulk=0;
+#if defined(AES_GCM_ASM2)
+                               if (len>=16 && AES_GCM_ASM2(gctx))
+                                       {
+                                       size_t res = (16-gctx->gcm.mres)%16;
+
+                                       if (CRYPTO_gcm128_decrypt(&gctx->gcm,
+                                                       in,out,res))
+                                               return -1;
+
+                                       bulk = AES_gcm_decrypt(in+res,
+                                                       out+res,len-res,
+                                                       gctx->gcm.key,
+                                                       gctx->gcm.Yi.c,
+                                                       gctx->gcm.Xi.u);
+                                       gctx->gcm.len.u[1] += bulk;
+                                       bulk += res;
+                                       }
+#endif
+                               if (CRYPTO_gcm128_decrypt(&gctx->gcm,
+                                                       in +bulk,
+                                                       out+bulk,
+                                                       len-bulk))
                                        return -1;
                                }
                        }
@@ -1012,6 +1577,8 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                {
                if (!ctx->encrypt)
                        {
+                       if (gctx->taglen < 0)
+                               return -1;
                        if (CRYPTO_gcm128_finish(&gctx->gcm,
                                        ctx->buf, gctx->taglen) != 0)
                                return -1;
@@ -1074,36 +1641,39 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                    {
                    if (enc)
                        {
-                       vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                       vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
                        xctx->xts.block1 = (block128_f)vpaes_encrypt;
                        }
                    else
                        {
-                       vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                       vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
                        xctx->xts.block1 = (block128_f)vpaes_decrypt;
                        }
 
-               vpaes_set_encrypt_key(key + ctx->key_len/2,
-                                               ctx->key_len * 4, &xctx->ks2);
-               xctx->xts.block2 = (block128_f)vpaes_encrypt;
+                   vpaes_set_encrypt_key(key + ctx->key_len/2,
+                                               ctx->key_len * 4, &xctx->ks2.ks);
+                   xctx->xts.block2 = (block128_f)vpaes_encrypt;
 
-               xctx->xts.key1 = &xctx->ks1;
-               break;
-               }
+                   xctx->xts.key1 = &xctx->ks1;
+                   break;
+                   }
+               else
 #endif
+               (void)0;        /* terminate potentially open 'else' */
+
                if (enc)
                        {
-                       AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                       AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
                        xctx->xts.block1 = (block128_f)AES_encrypt;
                        }
                else
                        {
-                       AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                       AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
                        xctx->xts.block1 = (block128_f)AES_decrypt;
                        }
 
                AES_set_encrypt_key(key + ctx->key_len/2,
-                                               ctx->key_len * 4, &xctx->ks2);
+                                               ctx->key_len * 4, &xctx->ks2.ks);
                xctx->xts.block2 = (block128_f)AES_encrypt;
 
                xctx->xts.key1 = &xctx->ks1;
@@ -1126,7 +1696,7 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                return 0;
        if (!out || !in || len<AES_BLOCK_SIZE)
                return 0;
-#ifdef OPENSSL_FIPS
+#ifdef OPENSSL_FIPSCANISTER
        /* Requirement of SP800-38E */
        if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
                        (len > (1UL<<20)*16))
@@ -1214,14 +1784,15 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef VPAES_CAPABLE
                if (VPAES_CAPABLE)
                        {
-                       vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks);
+                       vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks.ks);
                        CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
                                        &cctx->ks, (block128_f)vpaes_encrypt);
+                       cctx->str = NULL;
                        cctx->key_set = 1;
                        break;
                        }
 #endif
-               AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
+               AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks);
                CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
                                        &cctx->ks, (block128_f)AES_encrypt);
                cctx->str = NULL;
@@ -1309,5 +1880,291 @@ BLOCK_CIPHER_custom(NID_aes,128,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
 BLOCK_CIPHER_custom(NID_aes,192,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
 BLOCK_CIPHER_custom(NID_aes,256,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
 
+typedef struct
+       {
+       union { double align; AES_KEY ks; } ks;
+       /* Indicates if IV has been set */
+       unsigned char *iv;
+       } EVP_AES_WRAP_CTX;
+
+static int aes_wrap_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+       {
+       EVP_AES_WRAP_CTX *wctx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
+               {
+               if (ctx->encrypt)
+                       AES_set_encrypt_key(key, ctx->key_len * 8, &wctx->ks.ks);
+               else
+                       AES_set_decrypt_key(key, ctx->key_len * 8, &wctx->ks.ks);
+               if (!iv)
+                       wctx->iv = NULL;
+               }
+       if (iv)
+               {
+               memcpy(ctx->iv, iv, 8);
+               wctx->iv = ctx->iv;
+               }
+       return 1;
+       }
+
+static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t inlen)
+       {
+       EVP_AES_WRAP_CTX *wctx = ctx->cipher_data;
+       size_t rv;
+       if (inlen % 8)
+               return 0;
+       if (!out)
+               {
+               if (ctx->encrypt)
+                       return inlen + 8;
+               else
+                       return inlen - 8;
+               }
+       if (!in)
+               return 0;
+       if (ctx->encrypt)
+               rv = CRYPTO_128_wrap(&wctx->ks.ks, wctx->iv, out, in, inlen,
+                                               (block128_f)AES_encrypt);
+       else
+               rv = CRYPTO_128_unwrap(&wctx->ks.ks, wctx->iv, out, in, inlen,
+                                               (block128_f)AES_decrypt);
+       return rv ? (int)rv : -1;
+       }
+
+#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)
+
+static const EVP_CIPHER aes_128_wrap = {
+       NID_id_aes128_wrap,
+       8, 16, 8, WRAP_FLAGS,
+       aes_wrap_init_key, aes_wrap_cipher,
+       NULL,   
+       sizeof(EVP_AES_WRAP_CTX),
+       NULL,NULL,NULL,NULL };
+
+const EVP_CIPHER *EVP_aes_128_wrap(void)
+       {
+       return &aes_128_wrap;
+       }
+
+static const EVP_CIPHER aes_192_wrap = {
+       NID_id_aes192_wrap,
+       8, 24, 8, WRAP_FLAGS,
+       aes_wrap_init_key, aes_wrap_cipher,
+       NULL,   
+       sizeof(EVP_AES_WRAP_CTX),
+       NULL,NULL,NULL,NULL };
+
+const EVP_CIPHER *EVP_aes_192_wrap(void)
+       {
+       return &aes_192_wrap;
+       }
+
+static const EVP_CIPHER aes_256_wrap = {
+       NID_id_aes256_wrap,
+       8, 32, 8, WRAP_FLAGS,
+       aes_wrap_init_key, aes_wrap_cipher,
+       NULL,   
+       sizeof(EVP_AES_WRAP_CTX),
+       NULL,NULL,NULL,NULL };
+
+const EVP_CIPHER *EVP_aes_256_wrap(void)
+       {
+       return &aes_256_wrap;
+       }
+
+#define EVP_AEAD_AES_GCM_TAG_LEN 16
+
+struct aead_aes_gcm_ctx {
+       union { double align; AES_KEY ks; } ks;
+       GCM128_CONTEXT gcm;
+       ctr128_f ctr;
+       unsigned char tag_len;
+};
+
+static int aead_aes_gcm_init(EVP_AEAD_CTX *ctx,
+       const unsigned char *key, size_t key_len, size_t tag_len)
+       {
+       struct aead_aes_gcm_ctx *gcm_ctx;
+       const size_t key_bits = key_len * 8;
+
+       if (key_bits != 128 && key_bits != 256)
+               {
+               EVPerr(EVP_F_AEAD_AES_GCM_INIT, EVP_R_BAD_KEY_LENGTH);
+               return 0;  /* EVP_AEAD_CTX_init should catch this. */
+               }
+
+       if (tag_len == EVP_AEAD_DEFAULT_TAG_LENGTH)
+               tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
+
+       if (tag_len > EVP_AEAD_AES_GCM_TAG_LEN)
+               {
+               EVPerr(EVP_F_AEAD_AES_GCM_INIT, EVP_R_TAG_TOO_LARGE);
+               return 0;
+               }
+
+       gcm_ctx = OPENSSL_malloc(sizeof(struct aead_aes_gcm_ctx));
+       if (gcm_ctx == NULL)
+               return 0;
+
+#ifdef AESNI_CAPABLE
+       if (AESNI_CAPABLE)
+               {
+               aesni_set_encrypt_key(key, key_bits, &gcm_ctx->ks.ks);
+               CRYPTO_gcm128_init(&gcm_ctx->gcm, &gcm_ctx->ks.ks,
+                                  (block128_f)aesni_encrypt);
+               gcm_ctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
+               }
+       else
 #endif
+               {
+               gcm_ctx->ctr = aes_gcm_set_key(&gcm_ctx->ks.ks, &gcm_ctx->gcm,
+                                              key, key_len);
+               }
+       gcm_ctx->tag_len = tag_len;
+       ctx->aead_state = gcm_ctx;
+
+       return 1;
+       }
+
+static void aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx)
+       {
+       struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
+       OPENSSL_free(gcm_ctx);
+       }
+
+static ssize_t aead_aes_gcm_seal(const EVP_AEAD_CTX *ctx,
+       unsigned char *out, size_t max_out_len,
+       const unsigned char *nonce, size_t nonce_len,
+       const unsigned char *in, size_t in_len,
+       const unsigned char *ad, size_t ad_len)
+       {
+       size_t bulk = 0;
+       const struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
+       GCM128_CONTEXT gcm;
+
+       if (max_out_len < in_len + gcm_ctx->tag_len)
+               {
+               EVPerr(EVP_F_AEAD_AES_GCM_SEAL, EVP_R_BUFFER_TOO_SMALL);
+               return -1;
+               }
+
+       memcpy(&gcm, &gcm_ctx->gcm, sizeof(gcm));
+       CRYPTO_gcm128_setiv(&gcm, nonce, nonce_len);
+
+       if (ad_len > 0 && CRYPTO_gcm128_aad(&gcm, ad, ad_len))
+               return -1;
+
+       if (gcm_ctx->ctr)
+               {
+               if (CRYPTO_gcm128_encrypt_ctr32(&gcm, in + bulk, out + bulk,
+                                               in_len - bulk, gcm_ctx->ctr))
+                       return -1;
+               }
+       else
+               {
+               if (CRYPTO_gcm128_encrypt(&gcm, in + bulk, out + bulk,
+                                         in_len - bulk))
+                       return -1;
+               }
+
+       CRYPTO_gcm128_tag(&gcm, out + in_len, gcm_ctx->tag_len);
+       return in_len + gcm_ctx->tag_len;
+       }
+
+static ssize_t aead_aes_gcm_open(const EVP_AEAD_CTX *ctx,
+       unsigned char *out, size_t max_out_len,
+       const unsigned char *nonce, size_t nonce_len,
+       const unsigned char *in, size_t in_len,
+       const unsigned char *ad, size_t ad_len)
+       {
+       size_t bulk = 0;
+       const struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
+       unsigned char tag[EVP_AEAD_AES_GCM_TAG_LEN];
+       size_t out_len;
+       GCM128_CONTEXT gcm;
+
+       if (in_len < gcm_ctx->tag_len)
+               {
+               EVPerr(EVP_F_AEAD_AES_GCM_OPEN, EVP_R_BAD_DECRYPT);
+               return -1;
+               }
+
+       out_len = in_len - gcm_ctx->tag_len;
+
+       if (max_out_len < out_len)
+               {
+               EVPerr(EVP_F_AEAD_AES_GCM_OPEN, EVP_R_BUFFER_TOO_SMALL);
+               return -1;
+               }
+
+       memcpy(&gcm, &gcm_ctx->gcm, sizeof(gcm));
+       CRYPTO_gcm128_setiv(&gcm, nonce, nonce_len);
+
+       if (CRYPTO_gcm128_aad(&gcm, ad, ad_len))
+               return -1;
+
+       if (gcm_ctx->ctr)
+               {
+               if (CRYPTO_gcm128_decrypt_ctr32(&gcm, in + bulk, out + bulk,
+                                               in_len-bulk-gcm_ctx->tag_len,
+                                               gcm_ctx->ctr))
+                       return -1;
+               }
+       else
+               {
+               if (CRYPTO_gcm128_decrypt(&gcm, in + bulk, out + bulk,
+                                         in_len - bulk - gcm_ctx->tag_len))
+                       return -1;
+               }
+
+       CRYPTO_gcm128_tag(&gcm, tag, gcm_ctx->tag_len);
+       if (CRYPTO_memcmp(tag, in + out_len, gcm_ctx->tag_len) != 0)
+               {
+               EVPerr(EVP_F_AEAD_AES_GCM_OPEN, EVP_R_BAD_DECRYPT);
+               return -1;
+               }
+
+       return out_len;
+       }
+
+static const EVP_AEAD aead_aes_128_gcm = {
+       16,  /* key len */
+       12,  /* nonce len */
+       EVP_AEAD_AES_GCM_TAG_LEN,  /* overhead */
+       EVP_AEAD_AES_GCM_TAG_LEN,  /* max tag length */
+
+       aead_aes_gcm_init,
+       aead_aes_gcm_cleanup,
+       aead_aes_gcm_seal,
+       aead_aes_gcm_open,
+};
+
+static const EVP_AEAD aead_aes_256_gcm = {
+       32,  /* key len */
+       12,  /* nonce len */
+       EVP_AEAD_AES_GCM_TAG_LEN,  /* overhead */
+       EVP_AEAD_AES_GCM_TAG_LEN,  /* max tag length */
+
+       aead_aes_gcm_init,
+       aead_aes_gcm_cleanup,
+       aead_aes_gcm_seal,
+       aead_aes_gcm_open,
+};
+
+const EVP_AEAD *EVP_aead_aes_128_gcm()
+       {
+       return &aead_aes_128_gcm;
+       }
+
+const EVP_AEAD *EVP_aead_aes_256_gcm()
+       {
+       return &aead_aes_256_gcm;
+       }
+
 #endif