diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-31 15:25:23 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-31 15:25:23 +0000 |
| commit | b6cfecdc04a5a5e42ae4f2b025d8246cc16f3342 (patch) | |
| tree | 2a7386571f7a820ff0830927575980b68bb350c7 /apps | |
| parent | aa144ced5d61b5c7fb74acaebb37d85bd08f0416 (diff) | |
| download | src-b6cfecdc04a5a5e42ae4f2b025d8246cc16f3342.tar.gz src-b6cfecdc04a5a5e42ae4f2b025d8246cc16f3342.zip | |
Import OpenSSL 1.1.1f.vendor/openssl/1.1.1f
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=359482
svn path=/vendor-crypto/openssl/1.1.1f/; revision=359483; tag=vendor/openssl/1.1.1f
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/rehash.c | 14 | ||||
| -rw-r--r-- | apps/s_server.c | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/apps/rehash.c b/apps/rehash.c index 2b769fbceb87..fc1dffe97497 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com> * * Licensed under the OpenSSL license (the "License"). You may not use @@ -274,11 +274,19 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h) if (x->x509 != NULL) { type = TYPE_CERT; name = X509_get_subject_name(x->x509); - X509_digest(x->x509, evpmd, digest, NULL); + if (!X509_digest(x->x509, evpmd, digest, NULL)) { + BIO_printf(bio_err, "out of memory\n"); + ++errs; + goto end; + } } else if (x->crl != NULL) { type = TYPE_CRL; name = X509_CRL_get_issuer(x->crl); - X509_CRL_digest(x->crl, evpmd, digest, NULL); + if (!X509_CRL_digest(x->crl, evpmd, digest, NULL)) { + BIO_printf(bio_err, "out of memory\n"); + ++errs; + goto end; + } } else { ++errs; goto end; diff --git a/apps/s_server.c b/apps/s_server.c index 2248a432e268..0ba75999fd28 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * Copyright 2005 Nokia. All rights reserved. * @@ -1904,7 +1904,7 @@ int s_server_main(int argc, char *argv[]) BIO_printf(bio_s_out, "Setting secondary ctx parameters\n"); if (sdebug) - ssl_ctx_security_debug(ctx, sdebug); + ssl_ctx_security_debug(ctx2, sdebug); if (session_id_prefix) { if (strlen(session_id_prefix) >= 32) |