[openssl-commits] [openssl] OpenSSL_1_1_1-stable update
Richard Levitte
levitte at openssl.org
Mon Oct 29 13:25:51 UTC 2018
The branch OpenSSL_1_1_1-stable has been updated
via 7ccfce81db635eb89401ed0bf2d9e256e962e5d8 (commit)
via a862a1d517032ae4ba6ea4e7a32505bb8fedf8e7 (commit)
via bbc1c56a3c2e722f22ebae44e55598c05a58cf2a (commit)
from 6101850bafeb28fd5d752576037812c2672321e6 (commit)
- Log -----------------------------------------------------------------
commit 7ccfce81db635eb89401ed0bf2d9e256e962e5d8
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Sep 12 02:31:10 2018 +0200
ssl/statem: Don't compare size_t with less than zero
Reviewed-by: Paul Dale <paul.dale at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7194)
(cherry picked from commit 60690b5b8396d7d5234cd067206190fb8aca78d2)
commit a862a1d517032ae4ba6ea4e7a32505bb8fedf8e7
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Sep 12 02:30:25 2018 +0200
VMS & cryptoerr.h: include symhacks.h
Needed to clear a clash between ERR_load_CRYPTO_strings and
ERR_load_crypto_strings
Reviewed-by: Paul Dale <paul.dale at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7194)
(cherry picked from commit cc3a2e4f51679d99507a979f9a920f6068473aa2)
commit bbc1c56a3c2e722f22ebae44e55598c05a58cf2a
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Sep 12 02:28:35 2018 +0200
apps/rehash.c: Convert ISO-8859-1 to UTF-8
Believe it or not, the VMS C compiler is remarking on this
Reviewed-by: Paul Dale <paul.dale at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7194)
(cherry picked from commit 4602cc85aff35b7aa5e27dc57ead89f0867637f9)
-----------------------------------------------------------------------
Summary of changes:
apps/rehash.c | 2 +-
include/openssl/cryptoerr.h | 3 +++
ssl/statem/extensions.c | 6 ++++--
ssl/statem/statem_lib.c | 5 +++--
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/apps/rehash.c b/apps/rehash.c
index de7217c..bb41d31 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -1,6 +1,6 @@
/*
* Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
- * Copyright (c) 2013-2014 Timo Teräs <timo.teras at gmail.com>
+ * Copyright (c) 2013-2014 Timo Teräs <timo.teras at gmail.com>
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index e127ff6..10723d0 100644
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -14,6 +14,9 @@
# ifdef __cplusplus
extern "C"
# endif
+
+# include <openssl/symhacks.h>
+
int ERR_load_CRYPTO_strings(void);
/*
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 8422161..8d4939d 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -1530,10 +1530,12 @@ int tls_psk_do_binder(SSL *s, const EVP_MD *md, const unsigned char *msgstart,
*/
if (s->hello_retry_request == SSL_HRR_PENDING) {
size_t hdatalen;
+ long hdatalen_l;
void *hdata;
- hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
- if (hdatalen <= 0) {
+ hdatalen = hdatalen_l =
+ BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
+ if (hdatalen_l <= 0) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
SSL_R_BAD_HANDSHAKE_LENGTH);
goto err;
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 508bb88..e6e61f7 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -203,9 +203,10 @@ static int get_cert_verify_tbs_data(SSL *s, unsigned char *tls13tbs,
*hdatalen = TLS13_TBS_PREAMBLE_SIZE + hashlen;
} else {
size_t retlen;
+ long retlen_l;
- retlen = BIO_get_mem_data(s->s3->handshake_buffer, hdata);
- if (retlen <= 0) {
+ retlen = retlen_l = BIO_get_mem_data(s->s3->handshake_buffer, hdata);
+ if (retlen_l <= 0) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_GET_CERT_VERIFY_TBS_DATA,
ERR_R_INTERNAL_ERROR);
return 0;
More information about the openssl-commits
mailing list