projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use sk_*_new_null() instead of sk_*_new(NULL), since that takes care
[openssl.git]
/
apps
/
ciphers.c
diff --git
a/apps/ciphers.c
b/apps/ciphers.c
index f473f4c3dcec26c1af0a8fa689fa4f24bd5b224f..72b2009e1874e70d33223bb836888e54e4ec8212 100644
(file)
--- a/
apps/ciphers.c
+++ b/
apps/ciphers.c
@@
-74,9
+74,12
@@
static char *ciphers_usage[]={
" -v - verbose mode, a textual listing of the ciphers in SSLeay\n",
" -ssl2 - SSL2 mode\n",
" -ssl3 - SSL3 mode\n",
" -v - verbose mode, a textual listing of the ciphers in SSLeay\n",
" -ssl2 - SSL2 mode\n",
" -ssl3 - SSL3 mode\n",
+" -tls1 - TLS1 mode\n",
NULL
};
NULL
};
+int MAIN(int, char **);
+
int MAIN(int argc, char **argv)
{
int ret=1,i;
int MAIN(int argc, char **argv)
{
int ret=1,i;
@@
-119,6
+122,10
@@
int MAIN(int argc, char **argv)
#ifndef NO_SSL3
else if (strcmp(*argv,"-ssl3") == 0)
meth=SSLv3_client_method();
#ifndef NO_SSL3
else if (strcmp(*argv,"-ssl3") == 0)
meth=SSLv3_client_method();
+#endif
+#ifndef NO_TLS1
+ else if (strcmp(*argv,"-tls1") == 0)
+ meth=TLSv1_client_method();
#endif
else if ((strncmp(*argv,"-h",2) == 0) ||
(strcmp(*argv,"-?") == 0))
#endif
else if ((strncmp(*argv,"-h",2) == 0) ||
(strcmp(*argv,"-?") == 0))
@@
-141,7
+148,7
@@
int MAIN(int argc, char **argv)
goto end;
}
goto end;
}
-
SSLeay
_add_ssl_algorithms();
+
OpenSSL
_add_ssl_algorithms();
ctx=SSL_CTX_new(meth);
if (ctx == NULL) goto err;
ctx=SSL_CTX_new(meth);
if (ctx == NULL) goto err;