diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cipher/aead_test.cc | 2 | ||||
| -rw-r--r-- | crypto/cipher/e_chacha20poly1305.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/cipher/aead_test.cc b/crypto/cipher/aead_test.cc index 40812e50..79d7110d 100644 --- a/crypto/cipher/aead_test.cc +++ b/crypto/cipher/aead_test.cc @@ -200,7 +200,7 @@ struct AEADName { static const struct AEADName kAEADs[] = { { "aes-128-gcm", EVP_aead_aes_128_gcm }, { "aes-256-gcm", EVP_aead_aes_256_gcm }, - { "chacha20-poly1305", EVP_aead_chacha20_poly1305_rfc7539 }, + { "chacha20-poly1305", EVP_aead_chacha20_poly1305 }, { "chacha20-poly1305-old", EVP_aead_chacha20_poly1305_old }, { "rc4-md5-tls", EVP_aead_rc4_md5_tls }, { "rc4-sha1-tls", EVP_aead_rc4_sha1_tls }, diff --git a/crypto/cipher/e_chacha20poly1305.c b/crypto/cipher/e_chacha20poly1305.c index 3bc1daf7..f3849500 100644 --- a/crypto/cipher/e_chacha20poly1305.c +++ b/crypto/cipher/e_chacha20poly1305.c @@ -245,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) { @@ -305,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; -} |