Implement internally opaque bn access from evp
[openssl.git] / crypto / evp / e_aes.c
index a6bb0e5..ba3d43b 100644 (file)
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001-2014 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -48,7 +48,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_AES
@@ -63,7 +63,7 @@
 
 typedef struct
        {
-       AES_KEY ks;
+       union { double align; AES_KEY ks; } ks;
        block128_f block;
        union {
                cbc128_f cbc;
@@ -73,7 +73,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;
@@ -87,21 +87,45 @@ 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,
+                       const AES_KEY *key1, const AES_KEY *key2,
+                       const unsigned char iv[16]);
        } EVP_AES_XTS_CTX;
 
 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 */
        int len_set;            /* Set if message length set */
        int L, M;               /* L and M parameters from RFC3610 */
        CCM128_CONTEXT ccm;
+       ccm128_f str;
        } EVP_AES_CCM_CTX;
 
+#ifndef OPENSSL_NO_OCB
+typedef struct
+       {
+       AES_KEY ksenc;          /* AES key schedule to use for encryption */
+       AES_KEY ksdec;          /* AES key schedule to use for decryption */
+       int key_set;            /* Set if key initialised */
+       int iv_set;             /* Set if an iv is set */
+       OCB128_CONTEXT ocb;
+       unsigned char *iv;      /* Temporary IV store */
+       unsigned char tag[16];
+       unsigned char data_buf[16]; /* Store partial data blocks */
+       unsigned char aad_buf[16]; /* Store partial AAD blocks */
+       int data_buf_len;
+       int aad_buf_len;
+       int ivlen;              /* IV length */
+       int taglen;
+       } EVP_AES_OCB_CTX;
+#endif
+
 #define MAXBITCHUNK    ((size_t)1<<(sizeof(size_t)*8-4))
 
 #ifdef VPAES_ASM
@@ -122,15 +146,46 @@ void vpaes_cbc_encrypt(const unsigned char *in,
                        unsigned char *ivec, int enc);
 #endif
 #ifdef BSAES_ASM
+void bsaes_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                       size_t length, const AES_KEY *key,
+                       unsigned char ivec[16], int enc);
 void bsaes_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
                        size_t len, const AES_KEY *key,
                        const unsigned char ivec[16]);
+void bsaes_xts_encrypt(const unsigned char *inp, unsigned char *out,
+                       size_t len, const AES_KEY *key1,
+                       const AES_KEY *key2, const unsigned char iv[16]);
+void bsaes_xts_decrypt(const unsigned char *inp, unsigned char *out,
+                       size_t len, const AES_KEY *key1,
+                       const AES_KEY *key2, const unsigned char iv[16]);
 #endif
 #ifdef AES_CTR_ASM
 void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                        size_t blocks, const AES_KEY *key,
                        const unsigned char ivec[AES_BLOCK_SIZE]);
 #endif
+#ifdef AES_XTS_ASM
+void AES_xts_encrypt(const char *inp,char *out,size_t len,
+                       const AES_KEY *key1, const AES_KEY *key2,
+                       const unsigned char iv[16]);
+void AES_xts_decrypt(const char *inp,char *out,size_t len,
+                       const AES_KEY *key1, const AES_KEY *key2,
+                       const unsigned char iv[16]);
+#endif
+
+#if    defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC))
+# include "ppc_arch.h"
+# ifdef VPAES_ASM
+#  define VPAES_CAPABLE        (OPENSSL_ppccap_P & PPC_ALTIVEC)
+# endif
+# define HWAES_CAPABLE (OPENSSL_ppccap_P & PPC_CRYPTO207)
+# define HWAES_set_encrypt_key aes_p8_set_encrypt_key
+# define HWAES_set_decrypt_key aes_p8_set_decrypt_key
+# define HWAES_encrypt aes_p8_encrypt
+# define HWAES_decrypt aes_p8_decrypt
+# define HWAES_cbc_encrypt aes_p8_cbc_encrypt
+# define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks
+#endif
 
 #if    defined(AES_ASM) && !defined(I386_ONLY) &&      (  \
        ((defined(__i386)       || defined(__i386__)    || \
@@ -139,13 +194,13 @@ void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
        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)))
 #endif
 #ifdef BSAES_ASM
-#define BSAES_CAPABLE  VPAES_CAPABLE
+#define BSAES_CAPABLE  (OPENSSL_ia32cap_P[1]&(1<<(41-32)))
 #endif
 /*
  * AES-NI section
@@ -205,6 +260,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)
        {
@@ -289,7 +367,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;
@@ -334,17 +412,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;
@@ -359,32 +439,9 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
        return 1;
        }
 
+#define aesni_xts_cipher aes_xts_cipher
 static int aesni_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-               const unsigned char *in, size_t len)
-       {
-       EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
-       if (!xctx->xts.key1 || !xctx->xts.key2)
-               return -1;
-       if (!out || !in)
-               return -1;
-#ifdef OPENSSL_FIPS
-       /* Requirement of SP800-38E */
-       if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
-                       (len > (1L<<20)*16))
-               {
-               EVPerr(EVP_F_AESNI_XTS_CIPHER, EVP_R_TOO_LARGE);
-               return -1;
-               }
-#endif
-       if (ctx->encrypt)
-               aesni_xts_encrypt(in, out, len,
-                       xctx->xts.key1, xctx->xts.key2, ctx->iv);
-       else
-               aesni_xts_decrypt(in, out, len,
-                       xctx->xts.key1, xctx->xts.key2, ctx->iv);
-
-       return len;
-       }
+               const unsigned char *in, size_t len);
 
 static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                         const unsigned char *iv, int enc)
@@ -394,9 +451,11 @@ 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 :
+                               (ccm128_f)aesni_ccm64_decrypt_blocks;
                cctx->key_set = 1;
                }
        if (iv)
@@ -407,72 +466,63 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
        return 1;
        }
 
+#define aesni_ccm_cipher aes_ccm_cipher
 static int aesni_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-               const unsigned char *in, size_t len)
+               const unsigned char *in, size_t len);
+
+#ifndef OPENSSL_NO_OCB
+static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
        {
-       EVP_AES_CCM_CTX *cctx = ctx->cipher_data;
-       CCM128_CONTEXT *ccm = &cctx->ccm;
-       /* If not set up, return error */
-       if (!cctx->iv_set && !cctx->key_set)
-               return -1;
-       if (!ctx->encrypt && !cctx->tag_set)
-               return -1;
-       if (!out)
+       EVP_AES_OCB_CTX *octx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
                {
-               if (!in)
+               do
                        {
-                       if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L,len))
-                               return -1;
-                       cctx->len_set = 1;
-                       return len;
+                       /* We set both the encrypt and decrypt key here because decrypt
+                        * needs both. We could possibly optimise to remove setting the
+                        * decrypt for an encryption operation.
+                        */
+                       aesni_set_encrypt_key(key, ctx->key_len * 8, &octx->ksenc);
+                       aesni_set_decrypt_key(key, ctx->key_len * 8, &octx->ksdec);
+                       if(!CRYPTO_ocb128_init(&octx->ocb, &octx->ksenc, &octx->ksdec,
+                                       (block128_f)aesni_encrypt, (block128_f)aesni_decrypt))
+                               return 0;
                        }
-               /* If have AAD need message length */
-               if (!cctx->len_set && len)
-                       return -1;
-               CRYPTO_ccm128_aad(ccm, in, len);
-               return len;
-               }
-       /* EVP_*Final() doesn't return any data */
-       if (!in)
-               return 0;
-       /* If not set length yet do it */
-       if (!cctx->len_set)
-               {
-               if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L, len))
-                       return -1;
-               cctx->len_set = 1;
-               }
-       if (ctx->encrypt)
-               {
-               if (CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
-                               aesni_ccm64_encrypt_blocks))
-                       return -1;
-               cctx->tag_set = 1;
-               return len;
+               while (0);
+
+               /* If we have an iv we can set it directly, otherwise use
+                * saved IV.
+                */
+               if (iv == NULL && octx->iv_set)
+                       iv = octx->iv;
+               if (iv)
+                       {
+                       if(CRYPTO_ocb128_setiv(&octx->ocb, iv, octx->ivlen, octx->taglen) != 1)
+                               return 0;
+                       octx->iv_set = 1;
+                       }
+               octx->key_set = 1;
                }
        else
                {
-               int rv = -1;
-               if (!CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
-                               aesni_ccm64_decrypt_blocks))
-                       {
-                       unsigned char tag[16];
-                       if (CRYPTO_ccm128_tag(ccm, tag, cctx->M))
-                               {
-                               if (!memcmp(tag, ctx->buf, cctx->M))
-                                       rv = len;
-                               }
-                       }
-               if (rv == -1)
-                       OPENSSL_cleanse(out, len);
-               cctx->iv_set = 0;
-               cctx->tag_set = 0;
-               cctx->len_set = 0;
-               return rv;
+               /* If key set use IV, otherwise copy */
+               if (octx->key_set)
+                       CRYPTO_ocb128_setiv(&octx->ocb, iv, octx->ivlen, octx->taglen);
+               else
+                       memcpy(octx->iv, iv, octx->ivlen);
+               octx->iv_set = 1;
                }
-
+       return 1;
        }
 
+#define aesni_ocb_cipher aes_ocb_cipher
+static int aesni_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len);
+#endif /* OPENSSL_NO_OCB */
+
 #define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
 static const EVP_CIPHER aesni_##keylen##_##mode = { \
        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
@@ -516,173 +566,687 @@ static const EVP_CIPHER aes_##keylen##_##mode = { \
 const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
 { return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
 
-#else
+#elif  defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
 
-#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-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 &aes_##keylen##_##mode; }
+#include "sparc_arch.h"
 
-#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-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 &aes_##keylen##_##mode; }
-#endif
+extern unsigned int OPENSSL_sparcv9cap_P[];
 
-#define BLOCK_CIPHER_generic_pack(nid,keylen,flags)            \
-       BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
-       BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
-       BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-       BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-       BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags)       \
-       BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags)       \
-       BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)
+#define        SPARC_AES_CAPABLE       (OPENSSL_sparcv9cap_P[1] & CFR_AES)
 
-static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+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;
+       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)
-#ifdef VPAES_CAPABLE
-           if (VPAES_CAPABLE)
-               {
-               ret = vpaes_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
-               dat->block      = (block128_f)vpaes_decrypt;
-               dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
-                                       (cbc128_f)vpaes_cbc_encrypt :
-                                       NULL;
-               }
-           else
-#endif
-               {
-               ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
-               dat->block      = (block128_f)AES_decrypt;
-               dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
-                                       (cbc128_f)AES_cbc_encrypt :
-                                       NULL;
-               }
-       else
-#ifdef BSAES_CAPABLE
-           if (BSAES_CAPABLE && mode==EVP_CIPH_CTR_MODE)
-               {
-               ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
-               dat->block      = (block128_f)AES_encrypt;
-               dat->stream.ctr = (ctr128_f)bsaes_ctr32_encrypt_blocks;
-               }
-           else
-#endif
-#ifdef VPAES_CAPABLE
-           if (VPAES_CAPABLE)
                {
-               ret = vpaes_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
-               dat->block      = (block128_f)vpaes_encrypt;
-               dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
-                                       (cbc128_f)vpaes_cbc_encrypt :
-                                       NULL;
+                   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
-#endif
-               {
-               ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
-               dat->block      = (block128_f)AES_encrypt;
-               dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
-                                       (cbc128_f)AES_cbc_encrypt :
-                                       NULL;
-#ifdef AES_CTR_ASM
-               if (mode==EVP_CIPH_CTR_MODE)
-                       dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
-#endif
+       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_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);
+               EVPerr(EVP_F_AES_T4_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);
                return 0;
                }
 
        return 1;
        }
 
-static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
-       const unsigned char *in, size_t len)
-{
-       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
-
-       if (dat->stream.cbc)
-               (*dat->stream.cbc)(in,out,len,&dat->ks,ctx->iv,ctx->encrypt);
-       else if (ctx->encrypt)
-               CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);
-       else
-               CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);
-
-       return 1;
-}
-
-static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
-       const unsigned char *in, size_t len)
-{
-       size_t  bl = ctx->cipher->block_size;
-       size_t  i;
-       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
-
-       if (len<bl)     return 1;
-
-       for (i=0,len-=bl;i<=len;i+=bl)
-               (*dat->block)(in+i,out+i,&dat->ks);
-
-       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);
 
-static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
-       const unsigned char *in,size_t len)
-{
-       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+#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);
 
-       CRYPTO_ofb128_encrypt(in,out,len,&dat->ks,
-                       ctx->iv,&ctx->num,dat->block);
-       return 1;
-}
+#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);
 
-static int aes_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
-       const unsigned char *in,size_t len)
-{
-       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+#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);
 
-       CRYPTO_cfb128_encrypt(in,out,len,&dat->ks,
-                       ctx->iv,&ctx->num,ctx->encrypt,dat->block);
-       return 1;
-}
+#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);
 
-static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
-       const unsigned char *in,size_t len)
-{
-       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+#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);
 
-       CRYPTO_cfb128_8_encrypt(in,out,len,&dat->ks,
-                       ctx->iv,&ctx->num,ctx->encrypt,dat->block);
-       return 1;
-}
+#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_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+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);
+
+#ifndef OPENSSL_NO_OCB
+static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+       {
+       EVP_AES_OCB_CTX *octx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
+               {
+               do
+                       {
+                       /* We set both the encrypt and decrypt key here because decrypt
+                        * needs both. We could possibly optimise to remove setting the
+                        * decrypt for an encryption operation.
+                        */
+                       aes_t4_set_encrypt_key(key, ctx->key_len * 8, &octx->ksenc);
+                       aes_t4_set_decrypt_key(key, ctx->key_len * 8, &octx->ksdec);
+                       if(!CRYPTO_ocb128_init(&octx->ocb, &octx->ksenc, &octx->ksdec,
+                                       (block128_f)aes_t4_encrypt, (block128_f)aes_t4_decrypt))
+                               return 0;
+                       }
+               while (0);
+
+               /* If we have an iv we can set it directly, otherwise use
+                * saved IV.
+                */
+               if (iv == NULL && octx->iv_set)
+                       iv = octx->iv;
+               if (iv)
+                       {
+                       if(CRYPTO_ocb128_setiv(&octx->ocb, iv, octx->ivlen, octx->taglen) != 1)
+                               return 0;
+                       octx->iv_set = 1;
+                       }
+               octx->key_set = 1;
+               }
+       else
+               {
+               /* If key set use IV, otherwise copy */
+               if (octx->key_set)
+                       CRYPTO_ocb128_setiv(&octx->ocb, iv, octx->ivlen, octx->taglen);
+               else
+                       memcpy(octx->iv, iv, octx->ivlen);
+               octx->iv_set = 1;
+               }
+       return 1;
+       }
+
+#define aes_t4_ocb_cipher aes_ocb_cipher
+static int aes_t4_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len);
+#endif /* OPENSSL_NO_OCB */
+
+#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) \
+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 &aes_##keylen##_##mode; }
+
+#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
+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 &aes_##keylen##_##mode; }
+
+#endif
+
+#if defined(OPENSSL_CPUID_OBJ) && (defined(__arm__) || defined(__arm) || defined(__aarch64__))
+#include "arm_arch.h"
+#if __ARM_ARCH__>=7
+# if defined(BSAES_ASM)
+#  define BSAES_CAPABLE        (OPENSSL_armcap_P & ARMV7_NEON)
+# endif
+# define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
+# define HWAES_set_encrypt_key aes_v8_set_encrypt_key
+# define HWAES_set_decrypt_key aes_v8_set_decrypt_key
+# define HWAES_encrypt aes_v8_encrypt
+# define HWAES_decrypt aes_v8_decrypt
+# define HWAES_cbc_encrypt aes_v8_cbc_encrypt
+# define HWAES_ctr32_encrypt_blocks aes_v8_ctr32_encrypt_blocks
+#endif
+#endif
+
+#if defined(HWAES_CAPABLE)
+int HWAES_set_encrypt_key(const unsigned char *userKey, const int bits,
+       AES_KEY *key);
+int HWAES_set_decrypt_key(const unsigned char *userKey, const int bits,
+       AES_KEY *key);
+void HWAES_encrypt(const unsigned char *in, unsigned char *out,
+       const AES_KEY *key);
+void HWAES_decrypt(const unsigned char *in, unsigned char *out,
+       const AES_KEY *key);
+void HWAES_cbc_encrypt(const unsigned char *in, unsigned char *out,
+       size_t length, const AES_KEY *key,
+       unsigned char *ivec, const int enc);
+void HWAES_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
+       size_t len, const AES_KEY *key, const unsigned char ivec[16]);
+#endif
+
+#define BLOCK_CIPHER_generic_pack(nid,keylen,flags)            \
+       BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
+       BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
+       BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
+       BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
+       BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags)       \
+       BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags)       \
+       BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)
+
+static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                  const unsigned char *iv, int enc)
+       {
+       int ret, mode;
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       mode = ctx->cipher->flags & EVP_CIPH_MODE;
+       if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
+           && !enc)
+#ifdef HWAES_CAPABLE
+           if (HWAES_CAPABLE)
+               {
+               ret = HWAES_set_decrypt_key(key,ctx->key_len*8,&dat->ks.ks);
+               dat->block      = (block128_f)HWAES_decrypt;
+               dat->stream.cbc = NULL;
+#ifdef HWAES_cbc_encrypt
+               if (mode==EVP_CIPH_CBC_MODE)
+                   dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
+#endif
+               }
+           else
+#endif
+#ifdef BSAES_CAPABLE
+           if (BSAES_CAPABLE && mode==EVP_CIPH_CBC_MODE)
+               {
+               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;
+               }
+           else
+#endif
+#ifdef VPAES_CAPABLE
+           if (VPAES_CAPABLE)
+               {
+               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 :
+                                       NULL;
+               }
+           else
+#endif
+               {
+               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 :
+                                       NULL;
+               }
+       else
+#ifdef HWAES_CAPABLE
+           if (HWAES_CAPABLE)
+               {
+               ret = HWAES_set_encrypt_key(key,ctx->key_len*8,&dat->ks.ks);
+               dat->block      = (block128_f)HWAES_encrypt;
+               dat->stream.cbc = NULL;
+#ifdef HWAES_cbc_encrypt
+               if (mode==EVP_CIPH_CBC_MODE)
+                   dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
+               else
+#endif
+#ifdef HWAES_ctr32_encrypt_blocks
+               if (mode==EVP_CIPH_CTR_MODE)
+                   dat->stream.ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
+               else
+#endif
+               (void)0;        /* terminate potentially open 'else' */
+               }
+           else
+#endif
+#ifdef BSAES_CAPABLE
+           if (BSAES_CAPABLE && mode==EVP_CIPH_CTR_MODE)
+               {
+               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;
+               }
+           else
+#endif
+#ifdef VPAES_CAPABLE
+           if (VPAES_CAPABLE)
+               {
+               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 :
+                                       NULL;
+               }
+           else
+#endif
+               {
+               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 :
+                                       NULL;
+#ifdef AES_CTR_ASM
+               if (mode==EVP_CIPH_CTR_MODE)
+                       dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
+#endif
+               }
+
+       if(ret < 0)
+               {
+               EVPerr(EVP_F_AES_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);
+               return 0;
+               }
+
+       return 1;
+       }
+
+static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in, size_t len)
+{
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       if (dat->stream.cbc)
+               (*dat->stream.cbc)(in,out,len,&dat->ks,ctx->iv,ctx->encrypt);
+       else if (ctx->encrypt)
+               CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);
+       else
+               CRYPTO_cbc128_decrypt(in,out,len,&dat->ks,ctx->iv,dat->block);
+
+       return 1;
+}
+
+static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in, size_t len)
+{
+       size_t  bl = ctx->cipher->block_size;
+       size_t  i;
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       if (len<bl)     return 1;
+
+       for (i=0,len-=bl;i<=len;i+=bl)
+               (*dat->block)(in+i,out+i,&dat->ks);
+
+       return 1;
+}
+
+static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len)
+{
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       CRYPTO_ofb128_encrypt(in,out,len,&dat->ks,
+                       ctx->iv,&ctx->num,dat->block);
+       return 1;
+}
+
+static int aes_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len)
+{
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       CRYPTO_cfb128_encrypt(in,out,len,&dat->ks,
+                       ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+       return 1;
+}
+
+static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+       const unsigned char *in,size_t len)
+{
+       EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+       CRYPTO_cfb128_8_encrypt(in,out,len,&dat->ks,
+                       ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+       return 1;
+}
+
+static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
        const unsigned char *in,size_t len)
 {
        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
@@ -721,9 +1285,9 @@ static int aes_ctr_cipher (EVP_CIPHER_CTX *ctx, unsigned char *out,
        return 1;
 }
 
-BLOCK_CIPHER_generic_pack(NID_aes,128,EVP_CIPH_FLAG_FIPS)
-BLOCK_CIPHER_generic_pack(NID_aes,192,EVP_CIPH_FLAG_FIPS)
-BLOCK_CIPHER_generic_pack(NID_aes,256,EVP_CIPH_FLAG_FIPS)
+BLOCK_CIPHER_generic_pack(NID_aes,128,0)
+BLOCK_CIPHER_generic_pack(NID_aes,192,0)
+BLOCK_CIPHER_generic_pack(NID_aes,256,0)
 
 static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
        {
@@ -766,11 +1330,6 @@ 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
-               if (FIPS_module_mode() && !(c->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW)
-                                                && arg < 12)
-                       return 0;
-#endif
                /* Allocate memory for IV if needed */
                if ((arg > EVP_MAX_IV_LENGTH) && (arg > gctx->ivlen))
                        {
@@ -859,6 +1418,28 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
                /* Extra padding: tag appended to record */
                return EVP_GCM_TLS_TAG_LEN;
 
+       case EVP_CTRL_COPY:
+               {
+                       EVP_CIPHER_CTX *out = ptr;
+                       EVP_AES_GCM_CTX *gctx_out = out->cipher_data;
+                       if (gctx->gcm.key)
+                               {
+                               if (gctx->gcm.key != &gctx->ks)
+                                       return 0;
+                               gctx_out->gcm.key = &gctx_out->ks;
+                               }
+                       if (gctx->iv == c->iv)
+                               gctx_out->iv = out->iv;
+                       else
+                       {
+                               gctx_out->iv = OPENSSL_malloc(gctx->ivlen);
+                               if (!gctx_out->iv)
+                                       return 0;
+                               memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
+                       }
+                       return 1;
+               }
+
        default:
                return -1;
 
@@ -873,10 +1454,25 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                return 1;
        if (key)
                { do {
+#ifdef HWAES_CAPABLE
+               if (HWAES_CAPABLE)
+                       {
+                       HWAES_set_encrypt_key(key,ctx->key_len*8,&gctx->ks.ks);
+                       CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
+                                       (block128_f)HWAES_encrypt);
+#ifdef HWAES_ctr32_encrypt_blocks
+                       gctx->ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
+#else
+                       gctx->ctr = NULL;
+#endif
+                       break;
+                       }
+               else
+#endif
 #ifdef BSAES_CAPABLE
                if (BSAES_CAPABLE)
                        {
-                       AES_set_encrypt_key(key,ctx->key_len*8,&gctx->ks);
+                       AES_set_encrypt_key(key,ctx->key_len*8,&gctx->ks.ks);
                        CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
                                        (block128_f)AES_encrypt);
                        gctx->ctr = (ctr128_f)bsaes_ctr32_encrypt_blocks;
@@ -887,14 +1483,17 @@ static int aes_gcm_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,&gctx->ks);
+                       vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks.ks);
                        CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
                                        (block128_f)vpaes_encrypt);
                        gctx->ctr = NULL;
                        break;
                        }
+               else
 #endif
-               AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
+               (void)0;        /* terminate potentially open 'else' */
+
+               AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks);
                CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt);
 #ifdef AES_CTR_ASM
                gctx->ctr = (ctr128_f)AES_ctr32_encrypt;
@@ -940,7 +1539,7 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
        int rv = -1;
        /* Encrypt/decrypt must be performed in place */
-       if (out != in)
+       if (out != in || len < (EVP_GCM_TLS_EXPLICIT_IV_LEN+EVP_GCM_TLS_TAG_LEN))
                return -1;
        /* Set IV from start of buffer or generate IV and write to start
         * of buffer.
@@ -961,13 +1560,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;
@@ -980,13 +1612,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 */
@@ -1020,8 +1685,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)
@@ -1033,13 +1696,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;
                                }
                        }
@@ -1047,13 +1751,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;
                                }
                        }
@@ -1063,6 +1810,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;
@@ -1080,19 +1829,38 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 #define CUSTOM_FLAGS   (EVP_CIPH_FLAG_DEFAULT_ASN1 \
                | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
-               | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT)
+               | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+               | EVP_CIPH_CUSTOM_COPY)
 
 BLOCK_CIPHER_custom(NID_aes,128,1,12,gcm,GCM,
-               EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
+               EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
 BLOCK_CIPHER_custom(NID_aes,192,1,12,gcm,GCM,
-               EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
+               EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
 BLOCK_CIPHER_custom(NID_aes,256,1,12,gcm,GCM,
-               EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
+               EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
 
 static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
        {
        EVP_AES_XTS_CTX *xctx = c->cipher_data;
-       if (type != EVP_CTRL_INIT)
+       if (type == EVP_CTRL_COPY)
+               {
+               EVP_CIPHER_CTX *out = ptr;
+               EVP_AES_XTS_CTX *xctx_out = out->cipher_data;
+               if (xctx->xts.key1)
+                       {
+                       if (xctx->xts.key1 != &xctx->ks1)
+                               return 0;
+                       xctx_out->xts.key1 = &xctx_out->ks1;
+                       }
+               if (xctx->xts.key2)
+                       {
+                       if (xctx->xts.key2 != &xctx->ks2)
+                               return 0;
+                       xctx_out->xts.key2 = &xctx_out->ks2;
+                       }
+               return 1;
+               }
+       else if (type != EVP_CTRL_INIT)
                return -1;
        /* key1 and key2 are used as an indicator both key and IV are set */
        xctx->xts.key1 = NULL;
@@ -1109,42 +1877,78 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
        if (key) do
                {
+#ifdef AES_XTS_ASM
+               xctx->stream = enc ? AES_xts_encrypt : AES_xts_decrypt;
+#else
+               xctx->stream = NULL;
+#endif
                /* key_len is two AES keys */
+#ifdef HWAES_CAPABLE
+               if (HWAES_CAPABLE)
+                       {
+                       if (enc)
+                           {
+                           HWAES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
+                           xctx->xts.block1 = (block128_f)HWAES_encrypt;
+                           }
+                       else
+                           {
+                           HWAES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
+                           xctx->xts.block1 = (block128_f)HWAES_decrypt;
+                           }
+
+                       HWAES_set_encrypt_key(key + ctx->key_len/2,
+                                                   ctx->key_len * 4, &xctx->ks2.ks);
+                       xctx->xts.block2 = (block128_f)HWAES_encrypt;
+
+                       xctx->xts.key1 = &xctx->ks1;
+                       break;
+                       }
+               else
+#endif
+#ifdef BSAES_CAPABLE
+               if (BSAES_CAPABLE)
+                       xctx->stream = enc ? bsaes_xts_encrypt : bsaes_xts_decrypt;
+               else
+#endif
 #ifdef VPAES_CAPABLE
                if (VPAES_CAPABLE)
                    {
                    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;
@@ -1164,28 +1968,26 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        {
        EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
        if (!xctx->xts.key1 || !xctx->xts.key2)
-               return -1;
-       if (!out || !in)
-               return -1;
-#ifdef OPENSSL_FIPS
-       /* Requirement of SP800-38E */
-       if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
-                       (len > (1L<<20)*16))
-               {
-               EVPerr(EVP_F_AES_XTS_CIPHER, EVP_R_TOO_LARGE);
-               return -1;
-               }
-#endif
-       if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len,
+               return 0;
+       if (!out || !in || len<AES_BLOCK_SIZE)
+               return 0;
+       if (xctx->stream)
+               (*xctx->stream)(in, out, len,
+                               xctx->xts.key1, xctx->xts.key2, ctx->iv);
+       else if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len,
                                                                ctx->encrypt))
-               return -1;
-       return len;
+               return 0;
+       return 1;
        }
 
 #define aes_xts_cleanup NULL
 
-BLOCK_CIPHER_custom(NID_aes,128,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes,256,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
+#define XTS_FLAGS      (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
+                        | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+                        | EVP_CIPH_CUSTOM_COPY)
+
+BLOCK_CIPHER_custom(NID_aes,128,1,16,xts,XTS,XTS_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,1,16,xts,XTS,XTS_FLAGS)
 
 static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
        {
@@ -1232,6 +2034,19 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
                cctx->len_set = 0;
                return 1;
 
+       case EVP_CTRL_COPY:
+               {
+                       EVP_CIPHER_CTX *out = ptr;
+                       EVP_AES_CCM_CTX *cctx_out = out->cipher_data;
+                       if (cctx->ccm.key)
+                               {
+                               if (cctx->ccm.key != &cctx->ks)
+                                       return 0;
+                               cctx_out->ccm.key = &cctx_out->ks;
+                               }
+                       return 1;
+               }
+
        default:
                return -1;
 
@@ -1246,19 +2061,34 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                return 1;
        if (key) do
                {
+#ifdef HWAES_CAPABLE
+               if (HWAES_CAPABLE)
+                       {
+                       HWAES_set_encrypt_key(key,ctx->key_len*8,&cctx->ks.ks);
+
+                       CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
+                                       &cctx->ks, (block128_f)HWAES_encrypt);
+                       cctx->str = NULL;
+                       cctx->key_set = 1;
+                       break;
+                       }
+               else
+#endif
 #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;
                cctx->key_set = 1;
                } while (0);
        if (iv)
@@ -1306,7 +2136,9 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                }
        if (ctx->encrypt)
                {
-               if (CRYPTO_ccm128_encrypt(ccm, in, out, len))
+               if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
+                                               cctx->str) :
+                               CRYPTO_ccm128_encrypt(ccm, in, out, len))
                        return -1;
                cctx->tag_set = 1;
                return len;
@@ -1314,7 +2146,9 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        else
                {
                int rv = -1;
-               if (!CRYPTO_ccm128_decrypt(ccm, in, out, len))
+               if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
+                                               cctx->str) :
+                               !CRYPTO_ccm128_decrypt(ccm, in, out, len))
                        {
                        unsigned char tag[16];
                        if (CRYPTO_ccm128_tag(ccm, tag, cctx->M))
@@ -1335,8 +2169,471 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 #define aes_ccm_cleanup NULL
 
-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)
+BLOCK_CIPHER_custom(NID_aes,128,1,12,ccm,CCM,CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,192,1,12,ccm,CCM,CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,1,12,ccm,CCM,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, EVP_CIPHER_CTX_iv_length(ctx));
+               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;
+       /* AES wrap with padding has IV length of 4, without padding 8 */
+       int pad = EVP_CIPHER_CTX_iv_length(ctx) == 4;
+       /* No final operation so always return zero length */
+       if (!in)
+               return 0;
+       /* Input length must always be non-zero */
+       if (!inlen)
+               return -1;
+       /* If decrypting need at least 16 bytes and multiple of 8 */
+       if (!ctx->encrypt && (inlen < 16 || inlen & 0x7))
+               return -1;
+       /* If not padding input must be multiple of 8 */
+       if (!pad && inlen & 0x7)
+               return -1;
+       if (!out)
+               {
+               if (ctx->encrypt)
+                       {
+                       /* 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;
+                       }
+               }
+       if (pad)
+               {
+               if (ctx->encrypt)
+                       rv = CRYPTO_128_wrap_pad(&wctx->ks.ks, wctx->iv,
+                                               out, in, inlen,
+                                               (block128_f)AES_encrypt);
+               else
+                       rv = CRYPTO_128_unwrap_pad(&wctx->ks.ks, wctx->iv,
+                                               out, in, inlen,
+                                               (block128_f)AES_decrypt);
+               }
+       else
+               {
+               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;
+       }
+
+static const EVP_CIPHER aes_128_wrap_pad = {
+       NID_id_aes128_wrap_pad,
+       8, 16, 4, 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_pad(void)
+       {
+       return &aes_128_wrap_pad;
+       }
+
+static const EVP_CIPHER aes_192_wrap_pad = {
+       NID_id_aes192_wrap_pad,
+       8, 24, 4, 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_pad(void)
+       {
+       return &aes_192_wrap_pad;
+       }
+
+static const EVP_CIPHER aes_256_wrap_pad = {
+       NID_id_aes256_wrap_pad,
+       8, 32, 4, 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_pad(void)
+       {
+       return &aes_256_wrap_pad;
+       }
+
+#ifndef OPENSSL_NO_OCB
+static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+       {
+       EVP_AES_OCB_CTX *octx = c->cipher_data;
+       EVP_CIPHER_CTX *newc;
+       EVP_AES_OCB_CTX *new_octx;
+
+       switch (type)
+               {
+       case EVP_CTRL_INIT:
+               octx->key_set = 0;
+               octx->iv_set = 0;
+               octx->ivlen = c->cipher->iv_len;
+               octx->iv = c->iv;
+               octx->taglen = 16;
+               octx->data_buf_len = 0;
+               octx->aad_buf_len = 0;
+               return 1;
+
+       case EVP_CTRL_SET_IVLEN:
+               /* IV len must be 1 to 15 */
+               if (arg <= 0 || arg > 15)
+                       return 0;
+
+               octx->ivlen = arg;
+               return 1;
+
+       case EVP_CTRL_OCB_SET_TAGLEN:
+               /* Tag len must be 0 to 16 */
+               if (arg < 0 || arg > 16)
+                       return 0;
+
+               octx->taglen = arg;
+               return 1;
+
+       case EVP_CTRL_SET_TAG:
+               if (arg != octx->taglen || c->encrypt)
+                       return 0;
+               memcpy(octx->tag, ptr, arg);
+               return 1;
+
+       case EVP_CTRL_GET_TAG:
+               if (arg != octx->taglen || !c->encrypt)
+                       return 0;
+
+               memcpy(ptr, octx->tag, arg);
+               return 1;
+
+       case EVP_CTRL_COPY:
+               newc = (EVP_CIPHER_CTX *)ptr;
+               new_octx = newc->cipher_data;
+               return CRYPTO_ocb128_copy_ctx(&new_octx->ocb, &octx->ocb,
+                       &new_octx->ksenc, &new_octx->ksdec);
+
+       default:
+               return -1;
+
+               }
+       }
+
+
+static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+               const unsigned char *iv, int enc)
+       {
+       EVP_AES_OCB_CTX *octx = ctx->cipher_data;
+       if (!iv && !key)
+               return 1;
+       if (key)
+               {
+               do
+                       {
+                       /* We set both the encrypt and decrypt key here because decrypt
+                        * needs both. We could possibly optimise to remove setting the
+                        * decrypt for an encryption operation.
+                        */
+#ifdef VPAES_CAPABLE
+                       if (VPAES_CAPABLE)
+                               {
+                               vpaes_set_encrypt_key(key,ctx->key_len*8,&octx->ksenc);
+                               vpaes_set_decrypt_key(key,ctx->key_len*8,&octx->ksdec);
+                               if(!CRYPTO_ocb128_init(&octx->ocb,&octx->ksenc,&octx->ksdec,
+                                               (block128_f)vpaes_encrypt,(block128_f)vpaes_decrypt))
+                                       return 0;
+                               break;
+                               }
+#endif
+                       AES_set_encrypt_key(key, ctx->key_len * 8, &octx->ksenc);
+                       AES_set_decrypt_key(key, ctx->key_len * 8, &octx->ksdec);
+                       if(!CRYPTO_ocb128_init(&octx->ocb, &octx->ksenc, &octx->ksdec,
+                                       (block128_f)AES_encrypt, (block128_f)AES_decrypt))
+                               return 0;
+                       }
+               while (0);
+
+               /* If we have an iv we can set it directly, otherwise use
+                * saved IV.
+                */
+               if (iv == NULL && octx->iv_set)
+                       iv = octx->iv;
+               if (iv)
+                       {
+                       if(CRYPTO_ocb128_setiv(&octx->ocb, iv, octx->ivlen, octx->taglen) != 1)
+                               return 0;
+                       octx->iv_set = 1;
+                       }
+               octx->key_set = 1;
+               }
+       else
+               {
+               /* If key set use IV, otherwise copy */
+               if (octx->key_set)
+                       CRYPTO_ocb128_setiv(&octx->ocb, iv, octx->ivlen, octx->taglen);
+               else
+                       memcpy(octx->iv, iv, octx->ivlen);
+               octx->iv_set = 1;
+               }
+       return 1;
+       }
+
+static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+               const unsigned char *in, size_t len)
+       {
+       unsigned char *buf;
+       int *buf_len;
+       int written_len = 0;
+       size_t trailing_len;
+       EVP_AES_OCB_CTX *octx = ctx->cipher_data;
+
+       /* If IV or Key not set then return error */
+       if (!octx->iv_set)
+               return -1;
+
+       if (!octx->key_set)
+               return -1;
+
+       if (in)
+               {
+               /* Need to ensure we are only passing full blocks to low level OCB
+                * routines. We do it here rather than in EVP_EncryptUpdate/
+                * EVP_DecryptUpdate because we need to pass full blocks of AAD too
+                * and those routines don't support that
+                */
+
+               /* Are we dealing with AAD or normal data here? */
+               if (out == NULL)
+                       {
+                       buf = octx->aad_buf;
+                       buf_len = &(octx->aad_buf_len);
+                       }
+               else
+                       {
+                       buf = octx->data_buf;
+                       buf_len = &(octx->data_buf_len);
+                       }
+
+               /* If we've got a partially filled buffer from a previous call then use
+                * that data first
+                */
+               if(*buf_len)
+                       {
+                       unsigned int remaining;
+
+                       remaining = 16 - (*buf_len);
+                       if(remaining > len)
+                               {
+                               memcpy(buf+(*buf_len), in, len);
+                               *(buf_len)+=len;
+                               return 0;
+                               }
+                       memcpy(buf+(*buf_len), in, remaining);
+
+                       /* If we get here we've filled the buffer, so process it */
+                       len -= remaining;
+                       in += remaining;
+                       if (out == NULL)
+                               {
+                               if(!CRYPTO_ocb128_aad(&octx->ocb, buf, 16))
+                                       return -1;
+                               }
+                       else if (ctx->encrypt)
+                               {
+                               if(!CRYPTO_ocb128_encrypt(&octx->ocb, buf, out, 16))
+                                       return -1;
+                               }
+                       else
+                               {
+                               if(!CRYPTO_ocb128_decrypt(&octx->ocb, buf, out, 16))
+                                       return -1;
+                               }
+                       written_len = 16;
+                       *buf_len = 0;
+                       }
+
+               /* Do we have a partial block to handle at the end? */
+               trailing_len = len % 16;
+
+               /* If we've got some full blocks to handle, then process these first */
+               if(len != trailing_len)
+                       {
+                       if (out == NULL)
+                               {
+                               if(!CRYPTO_ocb128_aad(&octx->ocb, in, len-trailing_len))
+                                       return -1;
+                               }
+                       else if (ctx->encrypt)
+                               {
+                               if(!CRYPTO_ocb128_encrypt(&octx->ocb, in, out, len-trailing_len))
+                                       return -1;
+                               }
+                       else
+                               {
+                               if(!CRYPTO_ocb128_decrypt(&octx->ocb, in, out, len-trailing_len))
+                                       return -1;
+                               }
+                       written_len += len-trailing_len;
+                       in += len-trailing_len;
+                       }
+
+               /* Handle any trailing partial block */
+               if(trailing_len)
+                       {
+                       memcpy(buf, in, trailing_len);
+                       *buf_len = trailing_len;
+                       }
+
+               return written_len;
+               }
+       else
+               {
+               /* First of all empty the buffer of any partial block that we might
+                * have been provided - both for data and AAD
+                */
+               if(octx->data_buf_len)
+                       {
+                       if (ctx->encrypt)
+                               {
+                               if(!CRYPTO_ocb128_encrypt(&octx->ocb, octx->data_buf, out,
+                                               octx->data_buf_len))
+                                       return -1;
+                               }
+                       else
+                               {
+                               if(!CRYPTO_ocb128_decrypt(&octx->ocb, octx->data_buf, out,
+                                               octx->data_buf_len))
+                                       return -1;
+                               }
+                       written_len = octx->data_buf_len;
+                       octx->data_buf_len = 0;
+                       }
+               if(octx->aad_buf_len)
+                       {
+                       if(!CRYPTO_ocb128_aad(&octx->ocb, octx->aad_buf, octx->aad_buf_len))
+                               return -1;
+                       octx->aad_buf_len = 0;
+                       }
+               /* If decrypting then verify */
+               if (!ctx->encrypt)
+                       {
+                       if (octx->taglen < 0)
+                               return -1;
+                       if (CRYPTO_ocb128_finish(&octx->ocb,
+                                       octx->tag, octx->taglen) != 0)
+                               return -1;
+                       octx->iv_set = 0;
+                       return written_len;
+                       }
+               /* If encrypting then just get the tag */
+               if(CRYPTO_ocb128_tag(&octx->ocb, octx->tag, 16) != 1)
+                       return -1;
+               /* Don't reuse the IV */
+               octx->iv_set = 0;
+               return written_len;
+               }
+       }
+
+static int aes_ocb_cleanup(EVP_CIPHER_CTX *c)
+       {
+       EVP_AES_OCB_CTX *octx = c->cipher_data;
+       CRYPTO_ocb128_cleanup(&octx->ocb);
+       return 1;
+       }
+
+BLOCK_CIPHER_custom(NID_aes,128,16,12,ocb,OCB,CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,192,16,12,ocb,OCB,CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,16,12,ocb,OCB,CUSTOM_FLAGS)
+#endif /* OPENSSL_NO_OCB */
 
 #endif