--- crypto/asn1/a_type.c.~1~	2015-01-15 09:43:14.000000000 -0500
+++ crypto/asn1/a_type.c	2015-01-20 22:57:48.000000000 -0500
@@ -117,6 +117,8 @@
 	{
 	int result = -1;
 
+	if (!a && !b) return 0; /* both null-pointers => both absent/equal */
+
 	if (!a || !b || a->type != b->type) return -1;
 
 	switch (a->type)
--- crypto/asn1/x_algor.c.~1~	2015-01-15 09:43:14.000000000 -0500
+++ crypto/asn1/x_algor.c	2015-01-20 23:00:54.000000000 -0500
@@ -151,5 +151,12 @@
 		return rv;
 	if (!a->parameter && !b->parameter)
 		return 0;
+	if ((!a->parameter && b->parameter 
+	     && b->parameter->type == V_ASN1_NULL) 
+	    ||
+	    (!b->parameter && a->parameter 
+	     && a->parameter->type == V_ASN1_NULL)
+	    )
+	  return 0;
 	return ASN1_TYPE_cmp(a->parameter, b->parameter);
 	}