[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  12d2ee211b2a4f489787aaf9aa758fe3db128304 (commit)
      from  efba60ca7ab72cae62baad2aaaf2da32d1093c38 (commit)


- Log -----------------------------------------------------------------
commit 12d2ee211b2a4f489787aaf9aa758fe3db128304
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Oct 18 22:02:30 2016 +0200

    Fix config option 'no-deprecated'
    
    crypto/asn1/asn1_item_list.c needed including dh.h and rsa.h directly.
    The reason is that they are not included by x509.h when configured
    'no-deprecated'
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1741)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/asn1_item_list.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/asn1/asn1_item_list.c b/crypto/asn1/asn1_item_list.c
index eaeb34f..9798192 100644
--- a/crypto/asn1/asn1_item_list.c
+++ b/crypto/asn1/asn1_item_list.c
@@ -12,9 +12,11 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/cms.h>
+#include <openssl/dh.h>
 #include <openssl/ocsp.h>
 #include <openssl/pkcs7.h>
 #include <openssl/pkcs12.h>
+#include <openssl/rsa.h>
 #include <openssl/x509v3.h>
 
 #include "asn1_item_list.h"