diff options
Diffstat (limited to 'src/crypto/cipher/e_chacha20poly1305.c')
| -rw-r--r-- | src/crypto/cipher/e_chacha20poly1305.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/src/crypto/cipher/e_chacha20poly1305.c b/src/crypto/cipher/e_chacha20poly1305.c index c3ba457..f384950 100644 --- a/src/crypto/cipher/e_chacha20poly1305.c +++ b/src/crypto/cipher/e_chacha20poly1305.c @@ -108,10 +108,11 @@ static void aead_poly1305(aead_poly1305_update update, CRYPTO_poly1305_finish(&ctx, tag); } -static int seal(aead_poly1305_update poly1305_update, const EVP_AEAD_CTX *ctx, - uint8_t *out, size_t *out_len, size_t max_out_len, - const uint8_t nonce[12], const uint8_t *in, size_t in_len, - const uint8_t *ad, size_t ad_len) { +static int seal_impl(aead_poly1305_update poly1305_update, + const EVP_AEAD_CTX *ctx, uint8_t *out, size_t *out_len, + size_t max_out_len, const uint8_t nonce[12], + const uint8_t *in, size_t in_len, const uint8_t *ad, + size_t ad_len) { const struct aead_chacha20_poly1305_ctx *c20_ctx = ctx->aead_state; const uint64_t in_len_64 = in_len; @@ -146,10 +147,11 @@ static int seal(aead_poly1305_update poly1305_update, const EVP_AEAD_CTX *ctx, return 1; } -static int open(aead_poly1305_update poly1305_update, const EVP_AEAD_CTX *ctx, - uint8_t *out, size_t *out_len, size_t max_out_len, - const uint8_t nonce[12], const uint8_t *in, size_t in_len, - const uint8_t *ad, size_t ad_len) { +static int open_impl(aead_poly1305_update poly1305_update, + const EVP_AEAD_CTX *ctx, uint8_t *out, size_t *out_len, + size_t max_out_len, const uint8_t nonce[12], + const uint8_t *in, size_t in_len, const uint8_t *ad, + size_t ad_len) { const struct aead_chacha20_poly1305_ctx *c20_ctx = ctx->aead_state; size_t plaintext_len; const uint64_t in_len_64 = in_len; @@ -212,8 +214,8 @@ static int aead_chacha20_poly1305_seal(const EVP_AEAD_CTX *ctx, uint8_t *out, OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_UNSUPPORTED_NONCE_SIZE); return 0; } - return seal(poly1305_update, ctx, out, out_len, max_out_len, nonce, in, - in_len, ad, ad_len); + return seal_impl(poly1305_update, ctx, out, out_len, max_out_len, nonce, in, + in_len, ad, ad_len); } static int aead_chacha20_poly1305_open(const EVP_AEAD_CTX *ctx, uint8_t *out, @@ -225,8 +227,8 @@ static int aead_chacha20_poly1305_open(const EVP_AEAD_CTX *ctx, uint8_t *out, OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_UNSUPPORTED_NONCE_SIZE); return 0; } - return open(poly1305_update, ctx, out, out_len, max_out_len, nonce, in, - in_len, ad, ad_len); + return open_impl(poly1305_update, ctx, out, out_len, max_out_len, nonce, in, + in_len, ad, ad_len); } static const EVP_AEAD aead_chacha20_poly1305 = { @@ -243,10 +245,14 @@ static const EVP_AEAD aead_chacha20_poly1305 = { NULL, /* get_iv */ }; -const EVP_AEAD *EVP_aead_chacha20_poly1305_rfc7539(void) { +const EVP_AEAD *EVP_aead_chacha20_poly1305(void) { return &aead_chacha20_poly1305; } +const EVP_AEAD *EVP_aead_chacha20_poly1305_rfc7539(void) { + return EVP_aead_chacha20_poly1305(); +} + static void poly1305_update_old(poly1305_state *ctx, const uint8_t *ad, size_t ad_len, const uint8_t *ciphertext, size_t ciphertext_len) { @@ -267,8 +273,8 @@ static int aead_chacha20_poly1305_old_seal( uint8_t nonce_96[12]; memset(nonce_96, 0, 4); memcpy(nonce_96 + 4, nonce, 8); - return seal(poly1305_update_old, ctx, out, out_len, max_out_len, nonce_96, in, - in_len, ad, ad_len); + return seal_impl(poly1305_update_old, ctx, out, out_len, max_out_len, + nonce_96, in, in_len, ad, ad_len); } static int aead_chacha20_poly1305_old_open( @@ -282,8 +288,8 @@ static int aead_chacha20_poly1305_old_open( uint8_t nonce_96[12]; memset(nonce_96, 0, 4); memcpy(nonce_96 + 4, nonce, 8); - return open(poly1305_update_old, ctx, out, out_len, max_out_len, nonce_96, in, - in_len, ad, ad_len); + return open_impl(poly1305_update_old, ctx, out, out_len, max_out_len, + nonce_96, in, in_len, ad, ad_len); } static const EVP_AEAD aead_chacha20_poly1305_old = { @@ -303,7 +309,3 @@ static const EVP_AEAD aead_chacha20_poly1305_old = { const EVP_AEAD *EVP_aead_chacha20_poly1305_old(void) { return &aead_chacha20_poly1305_old; } - -const EVP_AEAD *EVP_aead_chacha20_poly1305(void) { - return &aead_chacha20_poly1305_old; -} |