Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/boringssl.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@chromium.org>2015-09-09 16:11:07 +0300
committerAdam Langley <agl@google.com>2015-09-09 20:56:59 +0300
commitc0125ef8f3cee41f49a2d938f5c087fc22c57ce4 (patch)
tree3afd7259bb79d6f296855406997df0161326f121 /ssl/ssl_cipher.c
parenta0a8dc208f6169981ea7bd6785a7fc99c25c4263 (diff)
Fix SSL_CIPHER_is_AESGCM.
It was checking algorithm_mac rather than algorithm_enc. (Coincidentally, it gave the right answer if you compiled out the ChaCha20 ciphers since SSL_AES128GCM and SSL_AEAD shared a value.) Change-Id: I17047425ef7fabb98969144965d8db9528ef8497 Reviewed-on: https://boringssl-review.googlesource.com/5850 Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/ssl_cipher.c')
-rw-r--r--ssl/ssl_cipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_cipher.c b/ssl/ssl_cipher.c
index 976c6025..1b8673e9 100644
--- a/ssl/ssl_cipher.c
+++ b/ssl/ssl_cipher.c
@@ -1358,7 +1358,7 @@ int SSL_CIPHER_has_MD5_HMAC(const SSL_CIPHER *cipher) {
}
int SSL_CIPHER_is_AESGCM(const SSL_CIPHER *cipher) {
- return (cipher->algorithm_mac & (SSL_AES128GCM | SSL_AES256GCM)) != 0;
+ return (cipher->algorithm_enc & (SSL_AES128GCM | SSL_AES256GCM)) != 0;
}
int SSL_CIPHER_is_CHACHA20POLY1305(const SSL_CIPHER *cipher) {