projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aes-x86_64.pl: commit#19797 was overzealous, partially reverse.
[oweals/openssl.git]
/
ssl
/
ssltest.c
diff --git
a/ssl/ssltest.c
b/ssl/ssltest.c
index b20ab0fb0500ac9be01d53b61142ac9dd6b2b75e..175635881daf50702cc490df19cea99c39d38078 100644
(file)
--- a/
ssl/ssltest.c
+++ b/
ssl/ssltest.c
@@
-154,8
+154,11
@@
#define USE_SOCKETS
#include "e_os.h"
#define USE_SOCKETS
#include "e_os.h"
+#ifdef OPENSSL_SYS_VMS
#define _XOPEN_SOURCE 500 /* Or isascii won't be declared properly on
VMS (at least with DECompHP C). */
#define _XOPEN_SOURCE 500 /* Or isascii won't be declared properly on
VMS (at least with DECompHP C). */
+#endif
+
#include <ctype.h>
#include <openssl/bio.h>
#include <ctype.h>
#include <openssl/bio.h>
@@
-317,7
+320,7
@@
static void sv_usage(void)
static void print_details(SSL *c_ssl, const char *prefix)
{
static void print_details(SSL *c_ssl, const char *prefix)
{
- SSL_CIPHER *ciph;
+
const
SSL_CIPHER *ciph;
X509 *cert;
ciph=SSL_get_current_cipher(c_ssl);
X509 *cert;
ciph=SSL_get_current_cipher(c_ssl);
@@
-481,8
+484,8
@@
int main(int argc, char *argv[])
int comp = 0;
#ifndef OPENSSL_NO_COMP
COMP_METHOD *cm = NULL;
int comp = 0;
#ifndef OPENSSL_NO_COMP
COMP_METHOD *cm = NULL;
-#endif
STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
+#endif
int test_cipherlist = 0;
verbose = 0;
int test_cipherlist = 0;
verbose = 0;
@@
-1427,7
+1430,6
@@
int doit(SSL *s_ssl, SSL *c_ssl, long count)
BIO *c_bio=NULL;
BIO *s_bio=NULL;
int c_r,c_w,s_r,s_w;
BIO *c_bio=NULL;
BIO *s_bio=NULL;
int c_r,c_w,s_r,s_w;
- int c_want,s_want;
int i,j;
int done=0;
int c_write,s_write;
int i,j;
int done=0;
int c_write,s_write;
@@
-1462,8
+1464,6
@@
int doit(SSL *s_ssl, SSL *c_ssl, long count)
c_r=0; s_r=1;
c_w=1; s_w=0;
c_r=0; s_r=1;
c_w=1; s_w=0;
- c_want=W_WRITE;
- s_want=0;
c_write=1,s_write=0;
/* We can always do writes */
c_write=1,s_write=0;
/* We can always do writes */
@@
-2177,7
+2177,7
@@
static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg)
if (cb_arg->proxy_auth)
{
if (cb_arg->proxy_auth)
{
- if (ok)
+ if (ok
> 0
)
{
const char *cond_end = NULL;
{
const char *cond_end = NULL;
@@
-2408,7
+2408,7
@@
static int do_test_cipherlist(void)
{
int i = 0;
const SSL_METHOD *meth;
{
int i = 0;
const SSL_METHOD *meth;
- SSL_CIPHER *ci, *tci = NULL;
+
const
SSL_CIPHER *ci, *tci = NULL;
#ifndef OPENSSL_NO_SSL2
fprintf(stderr, "testing SSLv2 cipher list order: ");
#ifndef OPENSSL_NO_SSL2
fprintf(stderr, "testing SSLv2 cipher list order: ");