diff options
| author | Adam Langley <agl@google.com> | 2015-04-29 15:27:34 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-04-29 15:27:34 -0700 |
| commit | cbe62cb9f697fcdea54dfa6d289c39a0c09007f3 (patch) | |
| tree | 47681bf06e0d8cf38e7f92b348cbd0dc3db7eee8 /src | |
| parent | 7a759c7828289d9ba48d980baf1db32372e17e82 (diff) | |
| download | external_boringssl-cbe62cb9f697fcdea54dfa6d289c39a0c09007f3.zip external_boringssl-cbe62cb9f697fcdea54dfa6d289c39a0c09007f3.tar.gz external_boringssl-cbe62cb9f697fcdea54dfa6d289c39a0c09007f3.tar.bz2 | |
Rename ECDHE-PSK-WITH-AES-128-GCM-SHA256 to follow the naming conventions.
“ECDHE-PSK-WITH-AES-128-GCM-SHA256” doesn't follow the standard naming
for OpenSSL: it was “-WITH-” in it and has a hyphen between “AES” and
“128”. This change fixes that.
Change-Id: Ie504624857f227fb18835a99cec7c3363beeed96
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/openssl/tls1.h | 2 | ||||
| -rw-r--r-- | src/ssl/test/runner/runner.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/include/openssl/tls1.h b/src/include/openssl/tls1.h index ef00b68..95731ff 100644 --- a/src/include/openssl/tls1.h +++ b/src/include/openssl/tls1.h @@ -679,7 +679,7 @@ OPENSSL_EXPORT int SSL_get_shared_sigalgs(SSL *s, int idx, int *psign, /* Non-standard ECDHE PSK ciphersuites */ #define TLS1_TXT_ECDHE_PSK_WITH_AES_128_GCM_SHA256 \ - "ECDHE-PSK-WITH-AES-128-GCM-SHA256" + "ECDHE-PSK-AES128-GCM-SHA256" #define TLS_CT_RSA_SIGN 1 #define TLS_CT_DSS_SIGN 2 diff --git a/src/ssl/test/runner/runner.go b/src/ssl/test/runner/runner.go index 137a87c..aaa2a4d 100644 --- a/src/ssl/test/runner/runner.go +++ b/src/ssl/test/runner/runner.go @@ -1054,7 +1054,7 @@ var testCipherSuites = []struct { {"ECDHE-ECDSA-AES256-SHA", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA}, {"ECDHE-ECDSA-AES256-SHA384", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384}, {"ECDHE-ECDSA-RC4-SHA", TLS_ECDHE_ECDSA_WITH_RC4_128_SHA}, - {"ECDHE-PSK-WITH-AES-128-GCM-SHA256", TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256}, + {"ECDHE-PSK-AES128-GCM-SHA256", TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256}, {"ECDHE-RSA-AES128-GCM", TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256}, {"ECDHE-RSA-AES128-SHA", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA}, {"ECDHE-RSA-AES128-SHA256", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256}, |