Commit dfcf20f
crypto: use new OpenSSL constants in CipherBase
This change replaces some constants with better alternatives which were
unavailable in OpenSSL 1.0.2.
PR-URL: #20339
Refs: #19794
Refs: #18138
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent b89d817 commit dfcf20f
1 file changed
Lines changed: 3 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2791,10 +2791,7 @@ bool CipherBase::InitAuthenticated(const char *cipher_type, int iv_len, | |||
| 2791 | 2791 | int auth_tag_len) { | |
| 2792 | 2792 | CHECK(IsAuthenticatedMode()); | |
| 2793 | 2793 | ||
| 2794 | - // TODO(tniessen) Use EVP_CTRL_AEAD_SET_IVLEN when migrating to OpenSSL 1.1.0 | ||
| 2795 | - static_assert(EVP_CTRL_CCM_SET_IVLEN == EVP_CTRL_GCM_SET_IVLEN, | ||
| 2796 | - "OpenSSL constants differ between GCM and CCM"); | ||
| 2797 | - if (!EVP_CIPHER_CTX_ctrl(ctx_, EVP_CTRL_GCM_SET_IVLEN, iv_len, nullptr)) { | ||
| 2794 | + if (!EVP_CIPHER_CTX_ctrl(ctx_, EVP_CTRL_AEAD_SET_IVLEN, iv_len, nullptr)) { | ||
| 2798 | 2795 | env()->ThrowError("Invalid IV length"); | |
| 2799 | 2796 | return false; | |
| 2800 | 2797 | } | |
@@ -3085,10 +3082,8 @@ bool CipherBase::Final(unsigned char** out, int *out_len) { | |||
| 3085 | 3082 | // must be specified in advance. | |
| 3086 | 3083 | if (mode == EVP_CIPH_GCM_MODE) | |
| 3087 | 3084 | auth_tag_len_ = sizeof(auth_tag_); | |
| 3088 | - // TOOD(tniessen) Use EVP_CTRL_AEAP_GET_TAG in OpenSSL 1.1.0 | ||
| 3089 | - static_assert(EVP_CTRL_CCM_GET_TAG == EVP_CTRL_GCM_GET_TAG, | ||
| 3090 | - "OpenSSL constants differ between GCM and CCM"); | ||
| 3091 | - CHECK_EQ(1, EVP_CIPHER_CTX_ctrl(ctx_, EVP_CTRL_GCM_GET_TAG, auth_tag_len_, | ||
| 3085 | + CHECK_EQ(1, EVP_CIPHER_CTX_ctrl(ctx_, EVP_CTRL_AEAD_GET_TAG, | ||
| 3086 | + auth_tag_len_, | ||
| 3092 | 3087 | reinterpret_cast<unsigned char*>(auth_tag_))); | |
| 3093 | 3088 | } | |
| 3094 | 3089 | } | |
0 commit comments