Remove references to AEAD in non-AEAD interface codepath

Since all AEAD ciphers now go through EVP_AEAD interface, the code which
uses EVP_Cipher interface no longer needs any of AEAD handling logic.

This also removes EVP_CTRL_AEAD_TLS1_AAD from GCM interface, which was
duplicating non-TLS-specific GCM logic and is not used anymore.

Change-Id: I5ddae880e7bc921337f9149a0acfdd00c9a478c3

2 files changed, 0 insertions, 126 deletions

diff --git a/crypto/cipher/cipher.h b/crypto/cipher/cipher.h
index 5ce1d63e..74f08efb 100644
--- a/crypto/cipher/cipher.h
+++ b/crypto/cipher/cipher.h
@@ -346,7 +346,6 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
 #define EVP_CTRL_GCM_SET_TAG 0x11
 #define EVP_CTRL_GCM_SET_IV_FIXED 0x12
 #define EVP_CTRL_GCM_IV_GEN 0x13
-#define EVP_CTRL_AEAD_TLS1_AAD 0x16
 #define EVP_CTRL_AEAD_SET_MAC_KEY 0x17
 /* Set the GCM invocation field, decrypt only */
 #define EVP_CTRL_GCM_SET_IV_INV 0x18
diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c
index c88eb076..741fd013 100644
--- a/crypto/cipher/e_aes.c
+++ b/crypto/cipher/e_aes.c
@@ -84,7 +84,6 @@ typedef struct {
   int ivlen;         /* IV length */
   int taglen;
   int iv_gen;      /* It is OK to generate IVs */
-  int tls_aad_len; /* TLS AAD length */
   ctr128_f ctr;
 } EVP_AES_GCM_CTX;
 
@@ -399,7 +398,6 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
       gctx->iv = c->iv;
       gctx->taglen = -1;
       gctx->iv_gen = 0;
-      gctx->tls_aad_len = -1;
       return 1;
 
     case EVP_CTRL_GCM_SET_IVLEN:
@@ -482,131 +480,11 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
       gctx->iv_set = 1;
       return 1;
 
-    case EVP_CTRL_AEAD_TLS1_AAD:
-      /* Save the AAD for later use */
-      if (arg != 13) {
-        return 0;
-      }
-      memcpy(c->buf, ptr, arg);
-      gctx->tls_aad_len = arg;
-      {
-        unsigned int len = c->buf[arg - 2] << 8 | c->buf[arg - 1];
-        /* Correct length for explicit IV */
-        len -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
-        /* If decrypting correct for tag too */
-        if (!c->encrypt)
-          len -= EVP_GCM_TLS_TAG_LEN;
-        c->buf[arg - 2] = len >> 8;
-        c->buf[arg - 1] = len & 0xff;
-      }
-
-      /* Extra padding: tag appended to record */
-      return EVP_GCM_TLS_TAG_LEN;
-
     default:
       return -1;
   }
 }
 
-/* Handle TLS GCM packet format. This consists of the last portion of the IV
- * followed by the payload and finally the tag. On encrypt generate IV, encrypt
- * payload and write the tag. On verify retrieve IV, decrypt payload and verify
- * tag. */
-static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out,
-                              const uint8_t *in, size_t len) {
-  EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
-  int rv = -1;
-  /* Encrypt/decrypt must be performed in place */
-  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. */
-  if (EVP_CIPHER_CTX_ctrl(
-          ctx, ctx->encrypt ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
-          EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0) {
-    goto err;
-  }
-  /* Use saved AAD */
-  if (!CRYPTO_gcm128_aad(&gctx->gcm, ctx->buf, gctx->tls_aad_len)) {
-    goto err;
-  }
-  /* Fix buffer and length to point to payload */
-  in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
-  out += EVP_GCM_TLS_EXPLICIT_IV_LEN;
-  len -= EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
-  if (ctx->encrypt) {
-    /* 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 + bulk, out + bulk,
-                                      len - bulk, gctx->ctr)) {
-        goto err;
-      }
-    } else {
-      size_t bulk = 0;
-      if (!CRYPTO_gcm128_encrypt(&gctx->gcm, in + bulk, out + bulk,
-                                 len - bulk)) {
-        goto err;
-      }
-    }
-    out += len;
-    /* Finally write tag */
-    CRYPTO_gcm128_tag(&gctx->gcm, out, EVP_GCM_TLS_TAG_LEN);
-    rv = len + EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
-  } else {
-    /* 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 + bulk, out + bulk,
-                                      len - bulk, gctx->ctr)) {
-        goto err;
-      }
-    } else {
-      size_t bulk = 0;
-      if (!CRYPTO_gcm128_decrypt(&gctx->gcm, in + bulk, out + bulk,
-                                 len - bulk)) {
-        goto err;
-      }
-    }
-    /* Retrieve tag */
-    CRYPTO_gcm128_tag(&gctx->gcm, ctx->buf, EVP_GCM_TLS_TAG_LEN);
-    /* If tag mismatch wipe buffer */
-    if (memcmp(ctx->buf, in + len, EVP_GCM_TLS_TAG_LEN)) {
-      OPENSSL_cleanse(out, len);
-      goto err;
-    }
-    rv = len;
-  }
-
-err:
-  gctx->iv_set = 0;
-  gctx->tls_aad_len = -1;
-  return rv;
-}
-
 static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
                           size_t len) {
   EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
@@ -615,9 +493,6 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
   if (!gctx->key_set) {
     return -1;
   }
-  if (gctx->tls_aad_len >= 0) {
-    return aes_gcm_tls_cipher(ctx, out, in, len);
-  }
   if (!gctx->iv_set) {
     return -1;
   }