Use EVP_AEAD_CTX in crypto/cipher/internal.h.
Change-Id: I3002d95d2b9db4dd05e1c56ef6ae410315b97ab9
Reviewed-on: https://boringssl-review.googlesource.com/4710
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/cipher/internal.h b/crypto/cipher/internal.h
index 605b8cb..b2a94f4 100644
--- a/crypto/cipher/internal.h
+++ b/crypto/cipher/internal.h
@@ -70,8 +70,6 @@
#define EVP_CIPH_MODE_MASK 0x3f
-struct evp_aead_ctx_st;
-
/* EVP_AEAD represents a specific AEAD algorithm. */
struct evp_aead_st {
uint8_t key_len;
@@ -79,27 +77,25 @@
uint8_t overhead;
uint8_t max_tag_len;
- /* init initialises an |evp_aead_ctx_st|. If this call returns zero then
+ /* init initialises an |EVP_AEAD_CTX|. If this call returns zero then
* |cleanup| will not be called for that context. */
- int (*init)(struct evp_aead_ctx_st *, const uint8_t *key,
- size_t key_len, size_t tag_len);
- int (*init_with_direction)(struct evp_aead_ctx_st *, const uint8_t *key,
- size_t key_len, size_t tag_len,
- enum evp_aead_direction_t dir);
- void (*cleanup)(struct evp_aead_ctx_st *);
+ int (*init)(EVP_AEAD_CTX *, const uint8_t *key, size_t key_len,
+ size_t tag_len);
+ int (*init_with_direction)(EVP_AEAD_CTX *, const uint8_t *key, size_t key_len,
+ size_t tag_len, enum evp_aead_direction_t dir);
+ void (*cleanup)(EVP_AEAD_CTX *);
- int (*seal)(const struct evp_aead_ctx_st *ctx, uint8_t *out,
- size_t *out_len, size_t max_out_len, const uint8_t *nonce,
- size_t nonce_len, const uint8_t *in, size_t in_len,
- const uint8_t *ad, size_t ad_len);
+ int (*seal)(const EVP_AEAD_CTX *ctx, uint8_t *out, size_t *out_len,
+ size_t max_out_len, const uint8_t *nonce, size_t nonce_len,
+ const uint8_t *in, size_t in_len, const uint8_t *ad,
+ size_t ad_len);
- int (*open)(const struct evp_aead_ctx_st *ctx, uint8_t *out,
- size_t *out_len, size_t max_out_len, const uint8_t *nonce,
- size_t nonce_len, const uint8_t *in, size_t in_len,
- const uint8_t *ad, size_t ad_len);
+ int (*open)(const EVP_AEAD_CTX *ctx, uint8_t *out, size_t *out_len,
+ size_t max_out_len, const uint8_t *nonce, size_t nonce_len,
+ const uint8_t *in, size_t in_len, const uint8_t *ad,
+ size_t ad_len);
- int (*get_rc4_state)(const struct evp_aead_ctx_st *ctx,
- const RC4_KEY **out_key);
+ int (*get_rc4_state)(const EVP_AEAD_CTX *ctx, const RC4_KEY **out_key);
};
