abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-19 11:23:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

first step of v2 final release

Browse Source
This commit is contained in:
Zhi Guan
2017-11-05 21:00:36 +08:00
parent 480b9e8d88
commit 27bde477a5
395 changed files with 26341 additions and 31364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/ciphers.c
View File

@@ -21,6 +21,7 @@ typedef enum OPTION_choice {
OPT_TLS1,
OPT_TLS1_1,
OPT_TLS1_2,
OPT_GMTLS,
OPT_PSK,
OPT_SRP,
OPT_V, OPT_UPPER_V, OPT_S
@@ -43,6 +44,9 @@ OPTIONS ciphers_options[] = {
#ifndef OPENSSL_NO_TLS1_2
{"tls1_2", OPT_TLS1_2, '-', "TLS1.2 mode"},
#endif
#ifndef OPENSSL_NO_GMTLS_METHOD
{"gmtls", OPT_GMTLS, '-', "GMTLS1.1 mode"},
#endif
#ifndef OPENSSL_NO_SSL_TRACE
{"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
#endif
@@ -135,6 +139,12 @@ int ciphers_main(int argc, char **argv)
min_version = TLS1_2_VERSION;
max_version = TLS1_2_VERSION;
break;
#ifndef OPENSSL_NO_GMTLS_METHOD
case OPT_GMTLS:
min_version = GMTLS_VERSION;
max_version = GMTLS_VERSION;
break;
#endif
case OPT_PSK:
#ifndef OPENSSL_NO_PSK
psk = 1;
@@ -222,7 +232,7 @@ int ciphers_main(int argc, char **argv)
const char *nm = SSL_CIPHER_standard_name(c);
if (nm == NULL)
nm = "UNKNOWN";
BIO_printf(bio_out, "%s - ", nm);
BIO_printf(bio_out, "%-40s - ", nm);
}
#endif
BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof buf));