summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjca <jca@openbsd.org>2014-03-30 22:39:42 +0000
committerjca <jca@openbsd.org>2014-03-30 22:39:42 +0000
commit4d1e2c39b8fe2c778ea864ad600a23bb4fd34257 (patch)
tree98b7d6f20deabab76ed35a33cedbf9cb602dcd4f
parentSSLeay_add_ssl_algorithms() is just a #define for SSL_library_init(), so (diff)
downloadwireguard-openbsd-4d1e2c39b8fe2c778ea864ad600a23bb4fd34257.tar.xz
wireguard-openbsd-4d1e2c39b8fe2c778ea864ad600a23bb4fd34257.zip
Check the return value from SSL_CTX_set_cipher_list(), for consistency.
ok guenther@ sthen@
-rw-r--r--usr.bin/ftp/fetch.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index b44114cbb34..fc2e68db2f4 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fetch.c,v 1.115 2014/03/30 22:37:41 jca Exp $ */
+/* $OpenBSD: fetch.c,v 1.116 2014/03/30 22:39:42 jca Exp $ */
/* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */
/*-
@@ -623,8 +623,11 @@ again:
SSL_CTX_set_verify_depth(ssl_ctx,
ssl_verify_depth);
}
- if (ssl_ciphers != NULL)
- SSL_CTX_set_cipher_list(ssl_ctx, ssl_ciphers);
+ if (ssl_ciphers != NULL &&
+ SSL_CTX_set_cipher_list(ssl_ctx, ssl_ciphers) == -1) {
+ ERR_print_errors_fp(ttyout);
+ goto cleanup_url_get;
+ }
ssl = SSL_new(ssl_ctx);
if (ssl == NULL) {
ERR_print_errors_fp(ttyout);