From 4ac84f8673eb7f3e5b98226aabe21f3e3111c7db Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Mon, 13 Jul 2015 11:58:44 +0800
Subject: Update openssl to 1.0.2d

Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
---
 Cryptlib/OpenSSL/crypto/comp/c_rle.c    | 4 ++--
 Cryptlib/OpenSSL/crypto/comp/c_zlib.c   | 1 +
 Cryptlib/OpenSSL/crypto/comp/comp_err.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'Cryptlib/OpenSSL/crypto/comp')

diff --git a/Cryptlib/OpenSSL/crypto/comp/c_rle.c b/Cryptlib/OpenSSL/crypto/comp/c_rle.c
index adf16631..e9aabbd1 100644
--- a/Cryptlib/OpenSSL/crypto/comp/c_rle.c
+++ b/Cryptlib/OpenSSL/crypto/comp/c_rle.c
@@ -33,7 +33,7 @@ static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
 {
     /* int i; */
 
-    if (olen < (ilen + 1)) {
+    if (ilen == 0 || olen < (ilen - 1)) {
         /* ZZZZZZZZZZZZZZZZZZZZZZ */
         return (-1);
     }
@@ -49,7 +49,7 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
 {
     int i;
 
-    if (ilen == 0 || olen < (ilen - 1)) {
+    if (olen < (ilen - 1)) {
         /* ZZZZZZZZZZZZZZZZZZZZZZ */
         return (-1);
     }
diff --git a/Cryptlib/OpenSSL/crypto/comp/c_zlib.c b/Cryptlib/OpenSSL/crypto/comp/c_zlib.c
index 07ef7394..6731af8b 100644
--- a/Cryptlib/OpenSSL/crypto/comp/c_zlib.c
+++ b/Cryptlib/OpenSSL/crypto/comp/c_zlib.c
@@ -746,6 +746,7 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
     default:
         ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
         break;
+
     }
 
     return ret;
diff --git a/Cryptlib/OpenSSL/crypto/comp/comp_err.c b/Cryptlib/OpenSSL/crypto/comp/comp_err.c
index edc88192..8ca159b6 100644
--- a/Cryptlib/OpenSSL/crypto/comp/comp_err.c
+++ b/Cryptlib/OpenSSL/crypto/comp/comp_err.c
@@ -1,6 +1,6 @@
 /* crypto/comp/comp_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
-- 
cgit v1.2.3