From ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Tue, 7 Jul 2015 08:57:00 -0400
Subject: Update openssl: 1.0.1m -> 1.0.1o

---
 openssl/crypto/dh/Makefile   | 2 ++
 openssl/crypto/dh/dh_ameth.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'openssl/crypto/dh')

diff --git a/openssl/crypto/dh/Makefile b/openssl/crypto/dh/Makefile
index f23b4f7fd..6d574f407 100644
--- a/openssl/crypto/dh/Makefile
+++ b/openssl/crypto/dh/Makefile
@@ -63,6 +63,8 @@ tests:
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
 	@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
 	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
diff --git a/openssl/crypto/dh/dh_ameth.c b/openssl/crypto/dh/dh_ameth.c
index 1dec10983..873eb2e22 100644
--- a/openssl/crypto/dh/dh_ameth.c
+++ b/openssl/crypto/dh/dh_ameth.c
@@ -135,7 +135,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     dh = pkey->pkey.dh;
 
     str = ASN1_STRING_new();
-    if(!str) {
+    if (!str) {
         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-- 
cgit v1.2.3