Make NEG_PUBKEY_BUG on by default.

[openssl.git] / crypto / asn1 / d2i_dsap.c

diff --git a/crypto/asn1/d2i_dsap.c b/crypto/asn1/d2i_dsap.c
index 2582b8fd454d51d95c92e44a74a76d2f5957cbdd..9d4dea6145aaef0c0d224b222a2f74efd67d9a1d 100644 (file)
--- a/crypto/asn1/d2i_dsap.c
+++ b/crypto/asn1/d2i_dsap.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DSA
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/bn.h>
@@ -63,6 +64,10 @@
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
 
+#ifndef NO_NEG_PUBKEY_BUG
+#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER
+#endif
+
 DSA *d2i_DSAparams(DSA **a, unsigned char **pp, long length)
        {
        int i=ERR_R_NESTED_ASN1_ERROR;
@@ -78,7 +83,7 @@ DSA *d2i_DSAparams(DSA **a, unsigned char **pp, long length)
        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
        if ((ret->g=BN_bin2bn(bs->data,bs->length,ret->g)) == NULL) goto err_bn;
 
-       ASN1_BIT_STRING_free(bs);
+       M_ASN1_BIT_STRING_free(bs);
 
        M_ASN1_D2I_Finish_2(a);
 
@@ -87,7 +92,7 @@ err_bn:
 err:
        ASN1err(ASN1_F_D2I_DSAPARAMS,i);
        if ((ret != NULL) && ((a == NULL) || (*a != ret))) DSA_free(ret);
-       if (bs != NULL) ASN1_BIT_STRING_free(bs);
+       if (bs != NULL) M_ASN1_BIT_STRING_free(bs);
        return(NULL);
        }
-
+#endif