Fix several crash causing defects from OpenSSL.

These include:
CVE-2015-0209 - Use After Free following d2i_ECPrivatekey error
CVE-2015-0286 - Segmentation fault in ASN1_TYPE_cmp
CVE-2015-0287 - ASN.1 structure reuse memory corruption
CVE-2015-0289 - PKCS7 NULL pointer dereferences

Several other issues did not apply or were already fixed.
Refer to https://www.openssl.org/news/secadv_20150319.txt

joint work with beck, doug, guenther, jsing, miod

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
index bb369fde6e..d3a7431356 100644
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ b/src/lib/libcrypto/asn1/n_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_pkey.c,v 1.25 2015/02/11 04:00:39 jsing Exp $ */
+/* $OpenBSD: n_pkey.c,v 1.26 2015/03/19 14:00:22 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -340,11 +340,11 @@ d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
                 return NULL;
         }
 
-        if ((enckey->os->length != 11) || (strncmp("private-key",
-        (char *)enckey->os->data, 11) != 0)) {
+        /* XXX 11 == strlen("private-key") */
+        if (enckey->os->length != 11 ||
+            memcmp("private-key", enckey->os->data, 11) != 0) {
                 ASN1err(ASN1_F_D2I_RSA_NET, ASN1_R_PRIVATE_KEY_HEADER_MISSING);
-                NETSCAPE_ENCRYPTED_PKEY_free(enckey);
-                return NULL;
+                goto err;
         }
         if (OBJ_obj2nid(enckey->enckey->algor->algorithm) != NID_rc4) {
                 ASN1err(ASN1_F_D2I_RSA_NET,