The branch master has been updated via 60690b5b8396d7d5234cd067206190fb8aca78d2 (commit) via cc3a2e4f51679d99507a979f9a920f6068473aa2 (commit) via 4602cc85aff35b7aa5e27dc57ead89f0867637f9 (commit) from f842b6b2a4d7cbb9d22e4605c502b73f25bb6a7b (commit)
- Log ----------------------------------------------------------------- commit 60690b5b8396d7d5234cd067206190fb8aca78d2 Author: Richard Levitte <levi...@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.d...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7194) commit cc3a2e4f51679d99507a979f9a920f6068473aa2 Author: Richard Levitte <levi...@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.d...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7194) commit 4602cc85aff35b7aa5e27dc57ead89f0867637f9 Author: Richard Levitte <levi...@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.d...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7194) ----------------------------------------------------------------------- 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.te...@gmail.com> + * Copyright (c) 2013-2014 Timo Teräs <timo.te...@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;
_____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits