NO_DSA, NO_RSA patches.

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 3021b80f0dbd5c33fabd4c757beced3834224afb..2e7d96af904adcfee5ee2cdb14fbd4154812d8bd 100644 (file)
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -62,8 +62,12 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1.h>

+#ifndef OPENSSL_NO_RSA

 #include <openssl/rsa.h>
 #include <openssl/rsa.h>

+#endif
+#ifndef OPENSSL_NO_DSA

 #include <openssl/dsa.h>
 #include <openssl/dsa.h>

+#endif

 
 EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
             long length)
 
 EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
             long length)

diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index 4780db0cf5e5acf9f45bff341155aadde8601a55..71f2eb361bd48f183153017761354fbfea0ff2b2 100644 (file)
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -62,8 +62,12 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1.h>

+#ifndef OPENSSL_NO_RSA

 #include <openssl/rsa.h>
 #include <openssl/rsa.h>

+#endif
+#ifndef OPENSSL_NO_DSA

 #include <openssl/dsa.h>
 #include <openssl/dsa.h>

+#endif

 
 EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
             long length)
 
 EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
             long length)

diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c
index 297e8376f8a4deef6f6a029924140f255bff9f13..1e951ae01d3bc30c3583136bf8c894aa70475ead 100644 (file)
--- a/crypto/asn1/i2d_pr.c
+++ b/crypto/asn1/i2d_pr.c
@@ -61,8 +61,12 @@
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>

+#ifndef OPENSSL_NO_RSA

 #include <openssl/rsa.h>
 #include <openssl/rsa.h>

+#endif
+#ifndef OPENSSL_NO_DSA

 #include <openssl/dsa.h>
 #include <openssl/dsa.h>

+#endif

 
 int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
        {
 
 int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/i2d_pu.c b/crypto/asn1/i2d_pu.c
index 360a5253da1107699ca4b32309845d80eee17c22..013d19bbf418b13205d5b968796dce056136cd28 100644 (file)
--- a/crypto/asn1/i2d_pu.c
+++ b/crypto/asn1/i2d_pu.c
@@ -61,8 +61,12 @@
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>

+#ifndef OPENSSL_NO_RSA

 #include <openssl/rsa.h>
 #include <openssl/rsa.h>

+#endif
+#ifndef OPENSSL_NO_DSA

 #include <openssl/dsa.h>
 #include <openssl/dsa.h>

+#endif

 
 int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
        {
 
 int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
        {