diff options
| author | Matt Caswell <matt@openssl.org> | 2018-03-30 14:33:21 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-30 19:28:33 +0100 |
| commit | 83cf3423f011c154d161e4545fa02bc569430011 (patch) | |
| tree | 25f877bcb1f0c8918bc416dd9111d0f7d2bf63a3 /ssl/t1_trce.c | |
| parent | 6714cb1462c4980330e4cc4f65d7c10bc36b369d (diff) | |
| download | openssl-83cf3423f011c154d161e4545fa02bc569430011.zip openssl-83cf3423f011c154d161e4545fa02bc569430011.tar.gz openssl-83cf3423f011c154d161e4545fa02bc569430011.tar.bz2 | |
Update trace code to know about GOST ciphersuites
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5808)
Diffstat (limited to 'ssl/t1_trce.c')
| -rw-r--r-- | ssl/t1_trce.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index f888d24..d3f67f5 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -184,6 +184,8 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = { {0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"}, {0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"}, {0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"}, + {0x0081, "TLS_GOSTR341001_WITH_28147_CNT_IMIT"}, + {0x0083, "TLS_GOSTR341001_WITH_NULL_GOSTR3411"}, {0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"}, {0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA"}, {0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA"}, @@ -441,6 +443,8 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = { {0x1305, "TLS_AES_128_CCM_8_SHA256"}, {0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, {0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"}, + {0xFF85, "GOST2012-GOST8912-GOST8912"}, + {0xFF87, "GOST2012-NULL-GOST12"}, }; /* Compression methods */ |