Fix for d2i_ASN1_bytes and stop PKCS#7 routines crashing is signed message

[oweals/openssl.git] / crypto / asn1 / d2i_s_pu.c

diff --git a/crypto/asn1/d2i_s_pu.c b/crypto/asn1/d2i_s_pu.c
index 562acd69225ff9568f2466933661762699079eda..94ea1c313b686fecb836024b7634fbe69a432e78 100644 (file)
--- a/crypto/asn1/d2i_s_pu.c
+++ b/crypto/asn1/d2i_s_pu.c
@@ -56,8 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
+/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
+#ifndef NO_DSA
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/bn.h>
@@ -65,10 +66,9 @@
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
 
-/*
- * ASN1err(ASN1_F_D2I_DSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- */
+#ifdef NEG_PUBKEY_BUG
+#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER
+#endif
 
 DSA *d2i_DSAPublicKey(DSA **a, unsigned char **pp, long length)
        {
@@ -118,4 +118,4 @@ err:
        if (bs != NULL) ASN1_INTEGER_free(bs);
        return(NULL);
        }
-
+#endif