projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test the storeutl expectation options
[openssl.git]
/
test
/
ssltest_old.c
diff --git
a/test/ssltest_old.c
b/test/ssltest_old.c
index faabc2dff0593d5f6f97959e2cb02df9ed1cc992..349d30a325a992e152de38b55aabaf52b39c44e2 100644
(file)
--- a/
test/ssltest_old.c
+++ b/
test/ssltest_old.c
@@
-9,6
+9,8
@@
* https://www.openssl.org/source/license.html
*/
* https://www.openssl.org/source/license.html
*/
+#include "e_os.h"
+
/* Or gethostname won't be declared properly on Linux and GNU platforms. */
#ifndef _BSD_SOURCE
# define _BSD_SOURCE 1
/* Or gethostname won't be declared properly on Linux and GNU platforms. */
#ifndef _BSD_SOURCE
# define _BSD_SOURCE 1
@@
-27,8
+29,6
@@
#include "internal/nelem.h"
#include "internal/nelem.h"
-#include "e_os.h"
-
#ifdef OPENSSL_SYS_VMS
/*
* Or isascii won't be declared properly on VMS (at least with DECompHP C).
#ifdef OPENSSL_SYS_VMS
/*
* Or isascii won't be declared properly on VMS (at least with DECompHP 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];
@@
-1471,9
+1471,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
+1915,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
+1994,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
+2177,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
+2256,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
+2750,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);