projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix race condition
[oweals/openssl.git]
/
apps
/
ciphers.c
diff --git
a/apps/ciphers.c
b/apps/ciphers.c
index 146527790ef49cdc31584d386c44b9641b179f77..2d6e104790cf9440193bf2e3db427e3dbdce396a 100644
(file)
--- a/
apps/ciphers.c
+++ b/
apps/ciphers.c
@@
-59,12
+59,12
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef NO_STDIO
+#ifdef
OPENSSL_
NO_STDIO
#define APPS_WIN16
#endif
#include "apps.h"
#define APPS_WIN16
#endif
#include "apps.h"
-#include
"err.h"
-#include
"ssl.h"
+#include
<openssl/err.h>
+#include
<openssl/ssl.h>
#undef PROG
#define PROG ciphers_main
#undef PROG
#define PROG ciphers_main
@@
-74,12
+74,13
@@
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(
argc, argv)
-int argc;
-char **argv;
+int MAIN(
int, char **);
+
+int MAIN(int argc, char **argv)
{
int ret=1,i;
int verbose=0;
{
int ret=1,i;
int verbose=0;
@@
-94,11
+95,11
@@
char **argv;
char buf[512];
BIO *STDout=NULL;
char buf[512];
BIO *STDout=NULL;
-#if !defined(
NO_SSL2) && !defined(
NO_SSL3)
+#if !defined(
OPENSSL_NO_SSL2) && !defined(OPENSSL_
NO_SSL3)
meth=SSLv23_server_method();
meth=SSLv23_server_method();
-#elif !defined(NO_SSL3)
+#elif !defined(
OPENSSL_
NO_SSL3)
meth=SSLv3_server_method();
meth=SSLv3_server_method();
-#elif !defined(NO_SSL2)
+#elif !defined(
OPENSSL_
NO_SSL2)
meth=SSLv2_server_method();
#endif
meth=SSLv2_server_method();
#endif
@@
-107,6
+108,12
@@
char **argv;
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+ {
+ BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+ STDout = BIO_push(tmpbio, STDout);
+ }
+#endif
argc--;
argv++;
argc--;
argv++;
@@
-114,13
+121,17
@@
char **argv;
{
if (strcmp(*argv,"-v") == 0)
verbose=1;
{
if (strcmp(*argv,"-v") == 0)
verbose=1;
-#ifndef NO_SSL2
+#ifndef
OPENSSL_
NO_SSL2
else if (strcmp(*argv,"-ssl2") == 0)
meth=SSLv2_client_method();
#endif
else if (strcmp(*argv,"-ssl2") == 0)
meth=SSLv2_client_method();
#endif
-#ifndef NO_SSL3
+#ifndef
OPENSSL_
NO_SSL3
else if (strcmp(*argv,"-ssl3") == 0)
meth=SSLv3_client_method();
else if (strcmp(*argv,"-ssl3") == 0)
meth=SSLv3_client_method();
+#endif
+#ifndef OPENSSL_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))
@@
-139,16
+150,20
@@
char **argv;
if (badops)
{
for (pp=ciphers_usage; (*pp != NULL); pp++)
if (badops)
{
for (pp=ciphers_usage; (*pp != NULL); pp++)
- BIO_printf(bio_err,*pp);
+ BIO_printf(bio_err,
"%s",
*pp);
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;
- if (ciphers != NULL)
- SSL_CTX_set_cipher_list(ctx,ciphers);
+ if (ciphers != NULL) {
+ if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
+ BIO_printf(bio_err, "Error in cipher list\n");
+ goto err;
+ }
+ }
ssl=SSL_new(ctx);
if (ssl == NULL) goto err;
ssl=SSL_new(ctx);
if (ssl == NULL) goto err;
@@
-186,7
+201,8
@@
err:
end:
if (ctx != NULL) SSL_CTX_free(ctx);
if (ssl != NULL) SSL_free(ssl);
end:
if (ctx != NULL) SSL_CTX_free(ctx);
if (ssl != NULL) SSL_free(ssl);
- if (STDout != NULL) BIO_free(STDout);
+ if (STDout != NULL) BIO_free_all(STDout);
+ apps_shutdown();
EXIT(ret);
}
EXIT(ret);
}