From 177f27d71ec5d77c4d6bc40015b114c093e3782a Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 6 Oct 2011 20:45:08 +0000
Subject: ? crypto/aes/aes-armv4.S ? crypto/aes/aesni-sha1-x86_64.s ?
 crypto/aes/aesni-x86_64.s ? crypto/aes/foo.pl ? crypto/aes/vpaes-x86_64.s ?
 crypto/bn/.bn_lib.c.swp ? crypto/bn/armv4-gf2m.S ? crypto/bn/diffs ?
 crypto/bn/modexp512-x86_64.s ? crypto/bn/x86_64-gf2m.s ?
 crypto/bn/x86_64-mont5.s ? crypto/ec/bc.txt ? crypto/ec/diffs ?
 crypto/modes/a.out ? crypto/modes/diffs ? crypto/modes/ghash-armv4.S ?
 crypto/modes/ghash-x86_64.s ? crypto/modes/op.h ? crypto/modes/tst.c ?
 crypto/modes/x.h ? crypto/objects/.obj_xref.txt.swp ? crypto/rand/diffs ?
 crypto/sha/sha-512 ? crypto/sha/sha1-armv4-large.S ?
 crypto/sha/sha256-armv4.S ? crypto/sha/sha512-armv4.S Index:
 crypto/objects/obj_xref.c
 =================================================================== RCS file:
 /v/openssl/cvs/openssl/crypto/objects/obj_xref.c,v retrieving revision 1.9
 diff -u -r1.9 obj_xref.c --- crypto/objects/obj_xref.c	5 Nov 2008 18:38:58
 -0000	1.9 +++ crypto/objects/obj_xref.c	6 Oct 2011 20:30:21 -0000 @@
 -110,8 +110,10 @@  #endif  	if (rv == NULL)  		return 0; -
 *pdig_nid = rv->hash_id; -	*ppkey_nid = rv->pkey_id; +	if (pdig_nid)
 +		*pdig_nid = rv->hash_id; +	if (ppkey_nid) +	
 *ppkey_nid = rv->pkey_id;  	return 1;  	}

@@ -144,7 +146,8 @@
 #endif
 	if (rv == NULL)
 		return 0;
-	*psignid = (*rv)->sign_id;
+	if (psignid)
+		*psignid = (*rv)->sign_id;
 	return 1;
 	}

Index: crypto/x509/x509type.c
===================================================================
RCS file: /v/openssl/cvs/openssl/crypto/x509/x509type.c,v
retrieving revision 1.10
diff -u -r1.10 x509type.c
--- crypto/x509/x509type.c	26 Oct 2007 12:06:33 -0000	1.10
+++ crypto/x509/x509type.c	6 Oct 2011 20:36:04 -0000
@@ -100,20 +100,26 @@
 		break;
 		}

-	i=X509_get_signature_type(x);
-	switch (i)
+	i=OBJ_obj2nid(x->sig_alg->algorithm);
+	if (i && OBJ_find_sigid_algs(i, NULL, &i))
 		{
-	case EVP_PKEY_RSA:
-		ret|=EVP_PKS_RSA;
-		break;
-	case EVP_PKEY_DSA:
-		ret|=EVP_PKS_DSA;
-		break;
-	case EVP_PKEY_EC:
-		ret|=EVP_PKS_EC;
-		break;
-	default:
-		break;
+
+		switch (i)
+			{
+		case NID_rsaEncryption:
+		case NID_rsa:
+			ret|=EVP_PKS_RSA;
+			break;
+		case NID_dsa:
+		case NID_dsa_2:
+			ret|=EVP_PKS_DSA;
+			break;
+		case NID_X9_62_id_ecPublicKey:
+			ret|=EVP_PKS_EC;
+			break;
+		default:
+			break;
+			}
 		}

 	if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
---
 crypto/objects/obj_xref.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'crypto/objects')

diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 152eca5c67..9f744bcede 100644
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -110,8 +110,10 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
 #endif
 	if (rv == NULL)
 		return 0;
-	*pdig_nid = rv->hash_id;
-	*ppkey_nid = rv->pkey_id;
+	if (pdig_nid)
+		*pdig_nid = rv->hash_id;
+	if (ppkey_nid)
+		*ppkey_nid = rv->pkey_id;
 	return 1;
 	}
 
@@ -144,7 +146,8 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
 #endif
 	if (rv == NULL)
 		return 0;
-	*psignid = (*rv)->sign_id;
+	if (psignid)
+		*psignid = (*rv)->sign_id;
 	return 1;
 	}
 
-- 
cgit v1.2.3