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
..
2011-09-27 19:34:40 +00:00
2011-09-05 09:57:20 +00:00
2011-01-26 16:08:08 +00:00
2011-09-01 15:01:35 +00:00
2011-09-14 20:48:49 +00:00
2011-09-05 09:46:15 +00:00
2011-02-21 17:51:59 +00:00
2011-01-26 16:08:08 +00:00
2011-09-05 09:46:15 +00:00
2011-01-26 16:08:08 +00:00
2011-02-03 12:03:51 +00:00
2011-09-02 11:20:15 +00:00
2011-09-14 20:48:49 +00:00
2011-09-05 09:46:15 +00:00
2011-09-14 20:48:49 +00:00
2011-09-05 09:46:15 +00:00
2011-09-14 20:48:49 +00:00
2011-06-08 13:52:36 +00:00
2011-09-05 09:46:15 +00:00
2011-09-05 09:46:15 +00:00
2011-09-05 09:46:15 +00:00
2011-09-17 00:17:46 +00:00
2011-09-05 09:46:15 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-06-28 12:33:58 +00:00
2011-02-21 17:51:59 +00:00
2011-09-14 20:48:49 +00:00
2011-10-06 20:44:02 +00:00
2011-05-25 14:52:21 +00:00
2011-01-26 16:08:08 +00:00
2011-09-12 08:25:14 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-09-05 09:46:15 +00:00
2011-01-26 16:08:08 +00:00
2011-08-23 20:51:38 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-09-14 20:48:49 +00:00
2011-01-26 16:08:08 +00:00
2011-09-17 12:57:33 +00:00
2011-05-29 13:51:14 +00:00
2011-03-23 00:11:32 +00:00
2011-01-26 16:08:08 +00:00
2009-05-15 16:36:56 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-01-26 16:08:08 +00:00
2011-06-28 12:42:10 +00:00
2011-10-06 20:44:02 +00:00
2011-01-26 16:08:08 +00:00
2008-04-17 10:19:16 +00:00
2011-08-12 12:28:52 +00:00
2011-07-22 14:20:50 +00:00
2011-07-17 17:40:29 +00:00
2011-07-17 17:40:29 +00:00
2011-05-19 18:09:02 +00:00
2011-07-23 12:10:26 +00:00
2011-06-23 09:46:27 +00:00
2011-03-25 16:20:35 +00:00
2011-09-14 20:48:49 +00:00
2004-04-19 18:09:28 +00:00
2003-10-29 22:25:04 +00:00
2000-02-01 02:21:16 +00:00
2008-07-04 23:12:52 +00:00
2011-09-21 16:17:18 +00:00
2011-02-03 16:16:30 +00:00
2011-05-07 20:36:05 +00:00
2011-03-19 10:58:14 +00:00
2011-02-14 17:05:42 +00:00
2004-07-10 13:16:02 +00:00
2004-09-23 22:11:39 +00:00
2011-03-19 10:58:14 +00:00
2004-09-23 22:11:39 +00:00
2006-10-23 07:41:05 +00:00
2004-09-23 22:11:39 +00:00
2011-09-05 09:46:15 +00:00
2010-08-02 09:32:26 +00:00
2007-06-23 18:47:51 +00:00
2009-04-20 11:33:12 +00:00
2011-04-12 13:01:40 +00:00
2004-07-10 13:16:02 +00:00
2004-08-03 19:15:21 +00:00
2004-07-10 13:16:02 +00:00
2011-05-19 18:09:02 +00:00
2011-04-05 15:24:10 +00:00
2009-06-01 12:13:44 +00:00
2005-09-20 20:19:07 +00:00
2011-03-19 10:58:14 +00:00
2010-04-15 13:25:26 +00:00
2005-12-16 10:37:24 +00:00
2009-03-31 10:38:37 +00:00
2010-12-13 18:15:28 +00:00
2011-04-17 12:46:00 +00:00
2011-05-21 10:17:02 +00:00
2011-05-27 13:32:34 +00:00
2010-09-18 08:46:53 +00:00
2011-04-17 12:46:00 +00:00
2011-08-12 21:38:19 +00:00
2011-05-23 08:14:32 +00:00
2011-03-20 10:23:51 +00:00
2011-09-14 20:48:49 +00:00
2003-11-28 13:10:58 +00:00
2011-03-19 10:58:14 +00:00
2011-06-04 13:08:25 +00:00
2011-06-04 12:20:45 +00:00