projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/proc/cpuinfo can have several lines containing the word "type". We want the one...
[openssl.git]
/
apps
/
ciphers.c
diff --git
a/apps/ciphers.c
b/apps/ciphers.c
index 16ff2b49275dbbe25a9139918b5212170d75faf8..b6e2f966d86e78d7b01c097ea655fc4932920156 100644
(file)
--- a/
apps/ciphers.c
+++ b/
apps/ciphers.c
@@
-1,5
+1,5
@@
/* apps/ciphers.c */
/* apps/ciphers.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-59,12
+59,12
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef
WIN16
+#ifdef
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,22
+74,24
@@
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;
- char **pp,*p;
+ char **pp;
+ const char *p;
int badops=0;
SSL_CTX *ctx=NULL;
SSL *ssl=NULL;
char *ciphers=NULL;
SSL_METHOD *meth=NULL;
int badops=0;
SSL_CTX *ctx=NULL;
SSL *ssl=NULL;
char *ciphers=NULL;
SSL_METHOD *meth=NULL;
- STACK *sk;
+ STACK
_OF(SSL_CIPHER)
*sk;
char buf[512];
BIO *STDout=NULL;
char buf[512];
BIO *STDout=NULL;
@@
-106,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 VMS
+ {
+ BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+ STDout = BIO_push(tmpbio, STDout);
+ }
+#endif
argc--;
argv++;
argc--;
argv++;
@@
-120,6
+128,10
@@
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))
@@
-142,12
+154,16
@@
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;
- 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;
@@
-167,10
+183,10
@@
char **argv;
{
sk=SSL_get_ciphers(ssl);
{
sk=SSL_get_ciphers(ssl);
- for (i=0; i<sk_num(sk); i++)
+ for (i=0; i<sk_
SSL_CIPHER_
num(sk); i++)
{
BIO_puts(STDout,SSL_CIPHER_description(
{
BIO_puts(STDout,SSL_CIPHER_description(
-
(SSL_CIPHER *)sk
_value(sk,i),
+
sk_SSL_CIPHER
_value(sk,i),
buf,512));
}
}
buf,512));
}
}
@@
-185,7
+201,7
@@
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);
EXIT(ret);
}
EXIT(ret);
}