CVS commit: src/crypto/external/bsd/openssl/dist/apps
Module Name:src
Committed By: christos
Date: Sun Mar 22 20:01:48 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/dist/apps: s_server.c
Log Message:
add back missing goto;
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/apps/s_server.c
diff -u src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.21 src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.22
--- src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.21 Sun Mar 22 15:56:07 2020
+++ src/crypto/external/bsd/openssl/dist/apps/s_server.c Sun Mar 22 16:01:48 2020
@@ -1809,6 +1809,7 @@ int s_server_main(int argc, char *argv[]
goto end;
if (max_version != 0
&& SSL_CTX_set_max_proto_version(ctx, max_version) == 0)
+goto end;
if (session_id_prefix) {
if (strlen(session_id_prefix) >= 32)
CVS commit: src/crypto/external/bsd/openssl/dist/apps
Module Name:src Committed By: christos Date: Sun Mar 22 19:56:07 UTC 2020 Modified Files: src/crypto/external/bsd/openssl/dist/apps: s_client.c s_server.c Log Message: always use fdin To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/openssl/dist/apps/s_client.c cvs rdiff -u -r1.20 -r1.21 \ src/crypto/external/bsd/openssl/dist/apps/s_server.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/apps/s_client.c diff -u src/crypto/external/bsd/openssl/dist/apps/s_client.c:1.21 src/crypto/external/bsd/openssl/dist/apps/s_client.c:1.22 --- src/crypto/external/bsd/openssl/dist/apps/s_client.c:1.21 Sat Mar 21 20:53:02 2020 +++ src/crypto/external/bsd/openssl/dist/apps/s_client.c Sun Mar 22 15:56:07 2020 @@ -2804,7 +2804,7 @@ int s_client_main(int argc, char **argv) * set the flag so we exit. */ if (read_tty && !at_eof) -openssl_fdset(fileno_stdin(), &readfds); +openssl_fdset(fdin, &readfds); #if !defined(OPENSSL_SYS_VMS) if (write_tty) openssl_fdset(fdout, &writefds); Index: src/crypto/external/bsd/openssl/dist/apps/s_server.c diff -u src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.20 src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.21 --- src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.20 Sat Mar 21 20:53:02 2020 +++ src/crypto/external/bsd/openssl/dist/apps/s_server.c Sun Mar 22 15:56:07 2020 @@ -2423,7 +2423,7 @@ static int sv_body(int s, int stype, int } FD_ZERO(&readfds); #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) -openssl_fdset(fileno_stdin(), &readfds); +openssl_fdset(fdin, &readfds); #endif openssl_fdset(s, &readfds); /*
CVS commit: src/crypto/external/bsd/openssl/dist/apps
Module Name:src
Committed By: christos
Date: Mon Apr 13 17:44:24 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/dist/apps: s_time.c
Log Message:
CID 1199067: Unchecked return
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/apps/s_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/apps/s_time.c
diff -u src/crypto/external/bsd/openssl/dist/apps/s_time.c:1.4 src/crypto/external/bsd/openssl/dist/apps/s_time.c:1.5
--- src/crypto/external/bsd/openssl/dist/apps/s_time.c:1.4 Mon Mar 23 06:22:45 2015
+++ src/crypto/external/bsd/openssl/dist/apps/s_time.c Mon Apr 13 13:44:23 2015
@@ -375,7 +375,11 @@ int MAIN(int argc, char **argv)
if (st_bugs)
SSL_CTX_set_options(tm_ctx, SSL_OP_ALL);
-SSL_CTX_set_cipher_list(tm_ctx, tm_cipher);
+if (!SSL_CTX_set_cipher_list(tm_ctx, tm_cipher)) {
+ /* BIO_printf(bio_err, "Error in cipher list\n"); */
+ goto end;
+}
+
if (!set_cert_stuff(tm_ctx, t_cert_file, t_key_file))
goto end;
CVS commit: src/crypto/external/bsd/openssl/dist/apps
Module Name:src
Committed By: christos
Date: Sat Aug 15 01:03:03 UTC 2009
Modified Files:
src/crypto/external/bsd/openssl/dist/apps: ocsp.c
Log Message:
don't try to free a buffer that came from the arguments, make a copy instead.
This can happen if we specify --port
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/openssl/dist/apps/ocsp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/apps/ocsp.c
diff -u src/crypto/external/bsd/openssl/dist/apps/ocsp.c:1.1.1.2 src/crypto/external/bsd/openssl/dist/apps/ocsp.c:1.2
--- src/crypto/external/bsd/openssl/dist/apps/ocsp.c:1.1.1.2 Wed Aug 5 14:32:05 2009
+++ src/crypto/external/bsd/openssl/dist/apps/ocsp.c Fri Aug 14 21:03:03 2009
@@ -226,7 +226,7 @@
if (args[1])
{
args++;
-port = *args;
+port = BUF_strdup(*args);
}
else badarg = 1;
}
