wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
openssl/crypto/x509
History
Dr. Stephen Henson 66bb328e11 ? 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
2011-10-06 20:44:02 +00:00
..
.cvsignore Add emacs cache files to .cvsignore. 2005-04-11 14:17:07 +00:00
by_dir.c Fix X509_STORE locking 2010-02-19 18:27:07 +00:00
by_file.c Keep disclaiming 16-bit platform support. For now remove WIN16 references 2005-12-18 19:11:37 +00:00
Makefile Change AR to ARX to allow exclusion of fips object modules 2011-01-26 16:08:08 +00:00
x509.h Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(), 2010-10-03 18:58:09 +00:00
x509_att.c Update from stable branch. 2008-06-26 23:27:31 +00:00
x509_cmp.c allow MD5 use for computing old format hash links 2011-06-22 02:18:19 +00:00
x509_d2.c
x509_def.c
x509_err.c Update from 0.9.8 stable. Eliminate duplicate error codes. 2006-11-21 21:29:44 +00:00
x509_ext.c
x509_lu.c Fix X509_STORE locking 2010-02-19 18:27:07 +00:00
x509_obj.c Bunch of constifications. 2007-10-13 15:51:32 +00:00
x509_r2x.c add additional checks + cleanup 2006-01-29 23:12:22 +00:00
x509_req.c Support for certificate status TLS extension. 2007-09-26 21:56:59 +00:00
x509_set.c use const ASN1_TIME * 2006-12-11 22:35:51 +00:00
x509_trs.c Experimental support for partial chain verification: if an intermediate 2010-02-25 00:17:22 +00:00
x509_txt.c avoid verification loops in trusted store when path building 2010-12-25 20:45:59 +00:00
x509_v3.c improved error checking and some fixes 2005-07-26 21:10:34 +00:00
x509_vfy.c PR: 2606 2011-09-23 13:39:23 +00:00
x509_vfy.h avoid verification loops in trusted store when path building 2010-12-25 20:45:59 +00:00
x509_vpm.c verify parameter enumeration functions 2010-02-25 00:08:23 +00:00
x509cset.c Update obsolete email address... 2008-11-05 18:39:08 +00:00
x509name.c no need to cast away the const 2006-03-04 13:55:55 +00:00
x509rset.c
x509spki.c Update obsolete email address... 2008-11-05 18:39:08 +00:00
x509type.c ? crypto/aes/aes-armv4.S 2011-10-06 20:44:02 +00:00
x_all.c Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(), 2010-10-03 18:58:09 +00:00