projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add answers for EVP_PKEY_get_default_digest_name() in RSA and DSA keymgmt
[openssl.git]
/
apps
/
ciphers.c
diff --git
a/apps/ciphers.c
b/apps/ciphers.c
index d171b865eb9257f2fe9c8dd73cbc1f9ec544ddab..280a5ab477ff8431c7c508d53807640c1856b00f 100644
(file)
--- a/
apps/ciphers.c
+++ b/
apps/ciphers.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 1995-201
7
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
The OpenSSL Project Authors. All Rights Reserved.
*
*
- * Licensed under the
OpenSSL license
(the "License"). You may not use
+ * Licensed under the
Apache License 2.0
(the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
@@
-11,6
+11,7
@@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
@@
-25,37
+26,50
@@
typedef enum OPTION_choice {
OPT_TLS1_3,
OPT_PSK,
OPT_SRP,
OPT_TLS1_3,
OPT_PSK,
OPT_SRP,
+ OPT_CIPHERSUITES,
OPT_V, OPT_UPPER_V, OPT_S
} OPTION_CHOICE;
const OPTIONS ciphers_options[] = {
OPT_V, OPT_UPPER_V, OPT_S
} OPTION_CHOICE;
const OPTIONS ciphers_options[] = {
+ {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cipher]\n"},
+
+ OPT_SECTION("General"),
{"help", OPT_HELP, '-', "Display this summary"},
{"help", OPT_HELP, '-', "Display this summary"},
+
+ OPT_SECTION("Output"),
{"v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers"},
{"V", OPT_UPPER_V, '-', "Even more verbose"},
{"v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers"},
{"V", OPT_UPPER_V, '-', "Even more verbose"},
+ {"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
+ {"convert", OPT_CONVERT, 's', "Convert standard name into OpenSSL name"},
+
+ OPT_SECTION("Cipher specification"),
{"s", OPT_S, '-', "Only supported ciphers"},
#ifndef OPENSSL_NO_SSL3
{"s", OPT_S, '-', "Only supported ciphers"},
#ifndef OPENSSL_NO_SSL3
- {"ssl3", OPT_SSL3, '-', "
SSL3 mode
"},
+ {"ssl3", OPT_SSL3, '-', "
Ciphers compatible with SSL3
"},
#endif
#ifndef OPENSSL_NO_TLS1
#endif
#ifndef OPENSSL_NO_TLS1
- {"tls1", OPT_TLS1, '-', "
TLS1 mode
"},
+ {"tls1", OPT_TLS1, '-', "
Ciphers compatible with TLS1
"},
#endif
#ifndef OPENSSL_NO_TLS1_1
#endif
#ifndef OPENSSL_NO_TLS1_1
- {"tls1_1", OPT_TLS1_1, '-', "
TLS1.1 mode
"},
+ {"tls1_1", OPT_TLS1_1, '-', "
Ciphers compatible with TLS1.1
"},
#endif
#ifndef OPENSSL_NO_TLS1_2
#endif
#ifndef OPENSSL_NO_TLS1_2
- {"tls1_2", OPT_TLS1_2, '-', "
TLS1.2 mode
"},
+ {"tls1_2", OPT_TLS1_2, '-', "
Ciphers compatible with TLS1.2
"},
#endif
#ifndef OPENSSL_NO_TLS1_3
#endif
#ifndef OPENSSL_NO_TLS1_3
- {"tls1_3", OPT_TLS1_3, '-', "
TLS1.3 mode
"},
+ {"tls1_3", OPT_TLS1_3, '-', "
Ciphers compatible with TLS1.3
"},
#endif
#endif
- {"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
#ifndef OPENSSL_NO_PSK
#ifndef OPENSSL_NO_PSK
- {"psk", OPT_PSK, '-', "
i
nclude ciphersuites requiring PSK"},
+ {"psk", OPT_PSK, '-', "
I
nclude ciphersuites requiring PSK"},
#endif
#ifndef OPENSSL_NO_SRP
#endif
#ifndef OPENSSL_NO_SRP
- {"srp", OPT_SRP, '-', "
i
nclude ciphersuites requiring SRP"},
+ {"srp", OPT_SRP, '-', "
I
nclude ciphersuites requiring SRP"},
#endif
#endif
- {"convert", OPT_CONVERT, 's', "Convert standard name into OpenSSL name"},
+ {"ciphersuites", OPT_CIPHERSUITES, 's',
+ "Configure the TLSv1.3 ciphersuites to use"},
+
+ OPT_PARAMETERS(),
+ {"cipher", 0, 0, "Cipher string to decode (optional)"},
{NULL}
};
{NULL}
};
@@
-90,7
+104,7
@@
int ciphers_main(int argc, char **argv)
int srp = 0;
#endif
const char *p;
int srp = 0;
#endif
const char *p;
- char *ciphers = NULL, *prog, *convert = NULL;
+ char *ciphers = NULL, *prog, *convert = NULL
, *ciphersuites = NULL
;
char buf[512];
OPTION_CHOICE o;
int min_version = 0, max_version = 0;
char buf[512];
OPTION_CHOICE o;
int min_version = 0, max_version = 0;
@@
-152,6
+166,9
@@
int ciphers_main(int argc, char **argv)
srp = 1;
#endif
break;
srp = 1;
#endif
break;
+ case OPT_CIPHERSUITES:
+ ciphersuites = opt_arg();
+ break;
}
}
argv = opt_rest();
}
}
argv = opt_rest();
@@
-184,6
+201,12
@@
int ciphers_main(int argc, char **argv)
if (srp)
SSL_CTX_set_srp_client_pwd_callback(ctx, dummy_srp);
#endif
if (srp)
SSL_CTX_set_srp_client_pwd_callback(ctx, dummy_srp);
#endif
+
+ if (ciphersuites != NULL && !SSL_CTX_set_ciphersuites(ctx, ciphersuites)) {
+ BIO_printf(bio_err, "Error setting TLSv1.3 ciphersuites\n");
+ goto err;
+ }
+
if (ciphers != NULL) {
if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
BIO_printf(bio_err, "Error in cipher list\n");
if (ciphers != NULL) {
if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
BIO_printf(bio_err, "Error in cipher list\n");
@@
-234,7
+257,7
@@
int ciphers_main(int argc, char **argv)
const char *nm = SSL_CIPHER_standard_name(c);
if (nm == NULL)
nm = "UNKNOWN";
const char *nm = SSL_CIPHER_standard_name(c);
if (nm == NULL)
nm = "UNKNOWN";
- BIO_printf(bio_out, "%s - ", nm);
+ BIO_printf(bio_out, "%
-45
s - ", nm);
}
BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof(buf)));
}
}
BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof(buf)));
}