diff options
| author | Otto Hollmann <otto.hollmann@suse.com> | 2020-05-28 13:39:33 +0200 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-06-04 16:45:00 +0200 |
| commit | c1fd005bfc80412efd7d0807256ef5815997edef (patch) | |
| tree | 1006cef4c78ec57e6484db881814a07efcf95a89 /ssl | |
| parent | CORE: make sure activated fallback providers stay activated (diff) | |
| download | openssl-c1fd005bfc80412efd7d0807256ef5815997edef.tar.xz openssl-c1fd005bfc80412efd7d0807256ef5815997edef.zip | |
Add cipher list ciphersuites which using encryption algorithm in mode CBC.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11984)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 1 | ||||
| -rw-r--r-- | ssl/ssl_local.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index ec2dabc89a..83710f8431 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -253,6 +253,7 @@ static const SSL_CIPHER cipher_aliases[] = { {0, SSL_TXT_ARIA_GCM, NULL, 0, 0, 0, SSL_ARIA128GCM | SSL_ARIA256GCM}, {0, SSL_TXT_ARIA128, NULL, 0, 0, 0, SSL_ARIA128GCM}, {0, SSL_TXT_ARIA256, NULL, 0, 0, 0, SSL_ARIA256GCM}, + {0, SSL_TXT_CBC, NULL, 0, 0, 0, SSL_CBC}, /* MAC aliases */ {0, SSL_TXT_MD5, NULL, 0, 0, 0, 0, SSL_MD5}, diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 083141931c..5e2379c093 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -246,6 +246,9 @@ # define SSL_CHACHA20 (SSL_CHACHA20POLY1305) # define SSL_ARIAGCM (SSL_ARIA128GCM | SSL_ARIA256GCM) # define SSL_ARIA (SSL_ARIAGCM) +# define SSL_CBC (SSL_DES | SSL_3DES | SSL_RC2 | SSL_IDEA \ + | SSL_AES128 | SSL_AES256 | SSL_CAMELLIA128 \ + | SSL_CAMELLIA256 | SSL_SEED) /* Bits for algorithm_mac (symmetric authentication) */ |