diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2020-09-27 15:01:12 -0700 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2020-10-29 15:29:31 -0700 |
| commit | 25fa346e906c4f487727cfebd5a40740709e677b (patch) | |
| tree | 0fb0b8d60c3b36f4f7928c1f9ce227c75ee8daa0 | |
| parent | d5242203692812a57b2012083822f0c818ca55c1 (diff) | |
| download | openssl-25fa346e906c4f487727cfebd5a40740709e677b.tar.gz | |
Unify ssl3_get_cipher_by_std_name() implementation
The handling for the SCSVs was the same as for regular ciphers;
just merge them into the same table-driven handler.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(cherry picked from commit 231849bc9ca69dfd3adf40821421d8e2d804d8e8)
(Merged from https://github.com/openssl/openssl/pull/13280)
| -rw-r--r-- | ssl/s3_lib.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a7ab206e79..4511b52c9a 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4072,9 +4072,10 @@ const SSL_CIPHER *ssl3_get_cipher_by_id(uint32_t id) const SSL_CIPHER *ssl3_get_cipher_by_std_name(const char *stdname) { - SSL_CIPHER *c = NULL, *tbl; - SSL_CIPHER *alltabs[] = {tls13_ciphers, ssl3_ciphers}; - size_t i, j, tblsize[] = {TLS13_NUM_CIPHERS, SSL3_NUM_CIPHERS}; + SSL_CIPHER *tbl; + SSL_CIPHER *alltabs[] = {tls13_ciphers, ssl3_ciphers, ssl3_scsvs}; + size_t i, j, tblsize[] = {TLS13_NUM_CIPHERS, SSL3_NUM_CIPHERS, + SSL3_NUM_SCSVS}; /* this is not efficient, necessary to optimize this? */ for (j = 0; j < OSSL_NELEM(alltabs); j++) { @@ -4086,16 +4087,7 @@ const SSL_CIPHER *ssl3_get_cipher_by_std_name(const char *stdname) } } } - if (c == NULL) { - tbl = ssl3_scsvs; - for (i = 0; i < SSL3_NUM_SCSVS; i++, tbl++) { - if (strcmp(stdname, tbl->stdname) == 0) { - c = tbl; - break; - } - } - } - return c; + return NULL; } /* |