projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix no-posix-io compile failure
[openssl.git]
/
test
/
ssltest_old.c
diff --git
a/test/ssltest_old.c
b/test/ssltest_old.c
index ebe052f55cbd4093f90b785ede31c95f8e6612a6..7d31d368c76bf9acd1ee03daff25ad27e7b4281b 100644
(file)
--- a/
test/ssltest_old.c
+++ b/
test/ssltest_old.c
@@
-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];
@@
-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;
@@
-1377,6
+1382,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
+1484,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;
}
@@
-1915,8
+1928,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
+2007,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
+2190,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
+2269,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
+2763,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);