From 1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 13 Apr 2014 15:25:35 +0000
Subject: Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build
 machinery.

---
 src/lib/libcrypto/asn1/a_int.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/asn1/a_int.c')

diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index ad0d2506f6..297c45a9ff 100644
--- a/src/lib/libcrypto/asn1/a_int.c
+++ b/src/lib/libcrypto/asn1/a_int.c
@@ -116,7 +116,7 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
 	int pad=0,ret,i,neg;
 	unsigned char *p,*n,pb=0;
 
-	if ((a == NULL) || (a->data == NULL)) return(0);
+	if (a == NULL) return(0);
 	neg=a->type & V_ASN1_NEG;
 	if (a->length == 0)
 		ret=1;
-- 
cgit v1.2.3-55-g6feb