projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiling warnings in example code
[openssl.git]
/
test
/
ssltest_old.c
diff --git
a/test/ssltest_old.c
b/test/ssltest_old.c
index ebe052f55cbd4093f90b785ede31c95f8e6612a6..e974f6c15d3800e7852db318eaca68793d4b3ee5 100644
(file)
--- a/
test/ssltest_old.c
+++ b/
test/ssltest_old.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
7
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@
-281,7
+281,7
@@
static unsigned char *next_protos_parse(size_t *outlen,
OPENSSL_free(out);
return NULL;
}
OPENSSL_free(out);
return NULL;
}
- out[start] =
i - start
;
+ out[start] =
(unsigned char)(i - start)
;
start = i + 1;
} else
out[i + 1] = in[i];
start = i + 1;
} else
out[i + 1] = in[i];
@@
-423,7
+423,7
@@
static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
return 1;
}
return 1;
}
-static int verify_serverinfo()
+static int verify_serverinfo(
void
)
{
if (serverinfo_sct != serverinfo_sct_seen)
return -1;
{
if (serverinfo_sct != serverinfo_sct_seen)
return -1;
@@
-612,6
+612,7
@@
static int custom_ext_3_srv_add_cb(SSL *s, unsigned int ext_type,
}
static char *cipher = NULL;
}
static char *cipher = NULL;
+static char *ciphersuites = NULL;
static int verbose = 0;
static int debug = 0;
static int verbose = 0;
static int debug = 0;
@@
-671,7
+672,8
@@
static void sv_usage(void)
fprintf(stderr, " -c_cert arg - Client certificate file\n");
fprintf(stderr,
" -c_key arg - Client key file (default: same as -c_cert)\n");
fprintf(stderr, " -c_cert arg - Client certificate file\n");
fprintf(stderr,
" -c_key arg - Client key file (default: same as -c_cert)\n");
- fprintf(stderr, " -cipher arg - The cipher list\n");
+ fprintf(stderr, " -cipher arg - The TLSv1.2 and below cipher list\n");
+ fprintf(stderr, " -ciphersuites arg - The TLSv1.3 ciphersuites\n");
fprintf(stderr, " -bio_pair - Use BIO pairs\n");
fprintf(stderr, " -ipv4 - Use IPv4 connection on localhost\n");
fprintf(stderr, " -ipv6 - Use IPv6 connection on localhost\n");
fprintf(stderr, " -bio_pair - Use BIO pairs\n");
fprintf(stderr, " -ipv4 - Use IPv4 connection on localhost\n");
fprintf(stderr, " -ipv6 - Use IPv6 connection on localhost\n");
@@
-918,7
+920,6
@@
int main(int argc, char *argv[])
verbose = 0;
debug = 0;
verbose = 0;
debug = 0;
- cipher = 0;
bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
@@
-1046,6
+1047,10
@@
int main(int argc, char *argv[])
if (--argc < 1)
goto bad;
cipher = *(++argv);
if (--argc < 1)
goto bad;
cipher = *(++argv);
+ } else if (strcmp(*argv, "-ciphersuites") == 0) {
+ if (--argc < 1)
+ goto bad;
+ ciphersuites = *(++argv);
} else if (strcmp(*argv, "-CApath") == 0) {
if (--argc < 1)
goto bad;
} else if (strcmp(*argv, "-CApath") == 0) {
if (--argc < 1)
goto bad;
@@
-1325,17
+1330,24
@@
int main(int argc, char *argv[])
} else if (tls1_2) {
min_version = TLS1_2_VERSION;
max_version = TLS1_2_VERSION;
} else if (tls1_2) {
min_version = TLS1_2_VERSION;
max_version = TLS1_2_VERSION;
+ } else {
+ min_version = SSL3_VERSION;
+ max_version = TLS_MAX_VERSION;
}
#endif
#ifndef OPENSSL_NO_DTLS
}
#endif
#ifndef OPENSSL_NO_DTLS
- if (dtls || dtls1 || dtls12)
+ if (dtls || dtls1 || dtls12)
{
meth = DTLS_method();
meth = DTLS_method();
- if (dtls1) {
- min_version = DTLS1_VERSION;
- max_version = DTLS1_VERSION;
- } else if (dtls12) {
- min_version = DTLS1_2_VERSION;
- max_version = DTLS1_2_VERSION;
+ if (dtls1) {
+ min_version = DTLS1_VERSION;
+ max_version = DTLS1_VERSION;
+ } else if (dtls12) {
+ min_version = DTLS1_2_VERSION;
+ max_version = DTLS1_2_VERSION;
+ } else {
+ min_version = DTLS_MIN_VERSION;
+ max_version = DTLS_MAX_VERSION;
+ }
}
#endif
}
#endif
@@
-1377,6
+1389,14
@@
int main(int argc, char *argv[])
goto end;
}
}
goto end;
}
}
+ if (ciphersuites != NULL) {
+ if (!SSL_CTX_set_ciphersuites(c_ctx, ciphersuites)
+ || !SSL_CTX_set_ciphersuites(s_ctx, ciphersuites)
+ || !SSL_CTX_set_ciphersuites(s_ctx2, ciphersuites)) {
+ ERR_print_errors(bio_err);
+ goto end;
+ }
+ }
#ifndef OPENSSL_NO_CT
if (ct_validation &&
#ifndef OPENSSL_NO_CT
if (ct_validation &&
@@
-1471,9
+1491,9
@@
int main(int argc, char *argv[])
{
int session_id_context = 0;
if (!SSL_CTX_set_session_id_context(s_ctx, (void *)&session_id_context,
{
int session_id_context = 0;
if (!SSL_CTX_set_session_id_context(s_ctx, (void *)&session_id_context,
- sizeof
session_id_context
) ||
+ sizeof
(session_id_context)
) ||
!SSL_CTX_set_session_id_context(s_ctx2, (void *)&session_id_context,
!SSL_CTX_set_session_id_context(s_ctx2, (void *)&session_id_context,
- sizeof
session_id_context
)) {
+ sizeof
(session_id_context)
)) {
ERR_print_errors(bio_err);
goto end;
}
ERR_print_errors(bio_err);
goto end;
}
@@
-1816,7
+1836,8
@@
int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
int err_in_client = 0;
int err_in_server = 0;
int err_in_client = 0;
int err_in_server = 0;
- acpt = BIO_new_accept("0");
+ acpt = BIO_new_accept(family == BIO_FAMILY_IPV4 ? "127.0.0.1:0"
+ : "[::1]:0");
if (acpt == NULL)
goto err;
BIO_set_accept_ip_family(acpt, family);
if (acpt == NULL)
goto err;
BIO_set_accept_ip_family(acpt, family);
@@
-1915,8
+1936,8
@@
int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
if (cw_num > 0) {
/* Write to server. */
if (cw_num > 0) {
/* Write to server. */
- if (cw_num > (long)sizeof
cbuf
)
- i = sizeof
cbuf
;
+ if (cw_num > (long)sizeof
(cbuf)
)
+ i = sizeof
(cbuf)
;
else
i = (int)cw_num;
r = BIO_write(c_ssl_bio, cbuf, i);
else
i = (int)cw_num;
r = BIO_write(c_ssl_bio, cbuf, i);
@@
-1994,8
+2015,8
@@
int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
if (sw_num > 0) {
/* Write to client. */
if (sw_num > 0) {
/* Write to client. */
- if (sw_num > (long)sizeof
sbuf
)
- i = sizeof
sbuf
;
+ if (sw_num > (long)sizeof
(sbuf)
)
+ i = sizeof
(sbuf)
;
else
i = (int)sw_num;
r = BIO_write(s_ssl_bio, sbuf, i);
else
i = (int)sw_num;
r = BIO_write(s_ssl_bio, sbuf, i);
@@
-2177,8
+2198,8
@@
int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
if (cw_num > 0) {
/* Write to server. */
if (cw_num > 0) {
/* Write to server. */
- if (cw_num > (long)sizeof
cbuf
)
- i = sizeof
cbuf
;
+ if (cw_num > (long)sizeof
(cbuf)
)
+ i = sizeof
(cbuf)
;
else
i = (int)cw_num;
r = BIO_write(c_ssl_bio, cbuf, i);
else
i = (int)cw_num;
r = BIO_write(c_ssl_bio, cbuf, i);
@@
-2256,8
+2277,8
@@
int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
if (sw_num > 0) {
/* Write to client. */
if (sw_num > 0) {
/* Write to client. */
- if (sw_num > (long)sizeof
sbuf
)
- i = sizeof
sbuf
;
+ if (sw_num > (long)sizeof
(sbuf)
)
+ i = sizeof
(sbuf)
;
else
i = (int)sw_num;
r = BIO_write(s_ssl_bio, sbuf, i);
else
i = (int)sw_num;
r = BIO_write(s_ssl_bio, sbuf, i);
@@
-2750,7
+2771,7
@@
static int verify_callback(int ok, X509_STORE_CTX *ctx)
char *s, buf[256];
s = X509_NAME_oneline(X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
char *s, buf[256];
s = X509_NAME_oneline(X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- buf, sizeof
buf
);
+ buf, sizeof
(buf)
);
if (s != NULL) {
if (ok)
printf("depth=%d %s\n", X509_STORE_CTX_get_error_depth(ctx), buf);
if (s != NULL) {
if (ok)
printf("depth=%d %s\n", X509_STORE_CTX_get_error_depth(ctx), buf);
@@
-2815,7
+2836,7
@@
static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
* $ openssl dhparam -C -noout -dsaparam 1024
* (The third function has been renamed to avoid name conflicts.)
*/
* $ openssl dhparam -C -noout -dsaparam 1024
* (The third function has been renamed to avoid name conflicts.)
*/
-static DH *get_dh512()
+static DH *get_dh512(
void
)
{
static unsigned char dh512_p[] = {
0xCB, 0xC8, 0xE1, 0x86, 0xD0, 0x1F, 0x94, 0x17, 0xA6, 0x99, 0xF0,
{
static unsigned char dh512_p[] = {
0xCB, 0xC8, 0xE1, 0x86, 0xD0, 0x1F, 0x94, 0x17, 0xA6, 0x99, 0xF0,
@@
-2849,7
+2870,7
@@
static DH *get_dh512()
return dh;
}
return dh;
}
-static DH *get_dh1024()
+static DH *get_dh1024(
void
)
{
static unsigned char dh1024_p[] = {
0xF8, 0x81, 0x89, 0x7D, 0x14, 0x24, 0xC5, 0xD1, 0xE6, 0xF7, 0xBF,
{
static unsigned char dh1024_p[] = {
0xF8, 0x81, 0x89, 0x7D, 0x14, 0x24, 0xC5, 0xD1, 0xE6, 0xF7, 0xBF,
@@
-2893,7
+2914,7
@@
static DH *get_dh1024()
return dh;
}
return dh;
}
-static DH *get_dh1024dsa()
+static DH *get_dh1024dsa(
void
)
{
static unsigned char dh1024_p[] = {
0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5,
{
static unsigned char dh1024_p[] = {
0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5,