From 5cbe75a3facfe8256454595ca3abbff7ad6076b0 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 19 Aug 2014 14:20:23 -0400 Subject: Update openssl to 0.9.8zb Also update to Tiano Cryptlib r15802 and remove the execute mode bits from the C and header files of openssl --- Cryptlib/OpenSSL/crypto/bio/b_dump.c | 0 Cryptlib/OpenSSL/crypto/bio/bf_buff.c | 0 Cryptlib/OpenSSL/crypto/bio/bf_nbio.c | 0 Cryptlib/OpenSSL/crypto/bio/bf_null.c | 0 Cryptlib/OpenSSL/crypto/bio/bio_cb.c | 0 Cryptlib/OpenSSL/crypto/bio/bio_err.c | 0 Cryptlib/OpenSSL/crypto/bio/bio_lib.c | 4 ++-- Cryptlib/OpenSSL/crypto/bio/bss_bio.c | 0 Cryptlib/OpenSSL/crypto/bio/bss_dgram.c | 0 Cryptlib/OpenSSL/crypto/bio/bss_fd.c | 0 Cryptlib/OpenSSL/crypto/bio/bss_file.c | 0 Cryptlib/OpenSSL/crypto/bio/bss_log.c | 0 Cryptlib/OpenSSL/crypto/bio/bss_mem.c | 0 Cryptlib/OpenSSL/crypto/bio/bss_null.c | 0 14 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/b_dump.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bf_buff.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bf_nbio.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bf_null.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bio_cb.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bio_err.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bio_lib.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_bio.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_dgram.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_fd.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_file.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_log.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_mem.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/bio/bss_null.c (limited to 'Cryptlib/OpenSSL/crypto/bio') diff --git a/Cryptlib/OpenSSL/crypto/bio/b_dump.c b/Cryptlib/OpenSSL/crypto/bio/b_dump.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bf_buff.c b/Cryptlib/OpenSSL/crypto/bio/bf_buff.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bf_nbio.c b/Cryptlib/OpenSSL/crypto/bio/bf_nbio.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bf_null.c b/Cryptlib/OpenSSL/crypto/bio/bf_null.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bio_cb.c b/Cryptlib/OpenSSL/crypto/bio/bio_cb.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bio_err.c b/Cryptlib/OpenSSL/crypto/bio/bio_err.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bio_lib.c b/Cryptlib/OpenSSL/crypto/bio/bio_lib.c old mode 100755 new mode 100644 index 371cdf52..6346c199 --- a/Cryptlib/OpenSSL/crypto/bio/bio_lib.c +++ b/Cryptlib/OpenSSL/crypto/bio/bio_lib.c @@ -132,8 +132,8 @@ int BIO_free(BIO *a) CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data); - if ((a->method == NULL) || (a->method->destroy == NULL)) return(1); - a->method->destroy(a); + if ((a->method != NULL) && (a->method->destroy != NULL)) + a->method->destroy(a); OPENSSL_free(a); return(1); } diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_bio.c b/Cryptlib/OpenSSL/crypto/bio/bss_bio.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_dgram.c b/Cryptlib/OpenSSL/crypto/bio/bss_dgram.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_fd.c b/Cryptlib/OpenSSL/crypto/bio/bss_fd.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_file.c b/Cryptlib/OpenSSL/crypto/bio/bss_file.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_log.c b/Cryptlib/OpenSSL/crypto/bio/bss_log.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_mem.c b/Cryptlib/OpenSSL/crypto/bio/bss_mem.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/bio/bss_null.c b/Cryptlib/OpenSSL/crypto/bio/bss_null.c old mode 100755 new mode 100644 -- cgit v1.2.3