Index: net/third_party/nss/ssl/ssl3ecc.c |
=================================================================== |
--- net/third_party/nss/ssl/ssl3ecc.c (revision 124804) |
+++ net/third_party/nss/ssl/ssl3ecc.c (working copy) |
@@ -40,7 +40,7 @@ |
* ***** END LICENSE BLOCK ***** */ |
/* ECC code moved here from ssl3con.c */ |
-/* $Id: ssl3ecc.c,v 1.24 2010/03/15 08:03:14 nelson%bolyard.com Exp $ */ |
+/* $Id: ssl3ecc.c,v 1.26 2012/02/13 17:19:40 kaie%kuix.de Exp $ */ |
#include "nss.h" |
#include "cert.h" |
@@ -317,7 +317,7 @@ |
} |
/* XXX SHOULD CALL ssl3_CreateECDHEphemeralKeys here, instead! */ |
privKey = SECKEY_CreateECPrivateKey(&svrPubKey->u.ec.DEREncodedParams, |
- &pubKey, NULL); |
+ &pubKey, ss->pkcs11PinArg); |
if (!privKey || !pubKey) { |
ssl_MapLowLevelError(SEC_ERROR_KEYGEN_FAIL); |
rv = SECFailure; |
@@ -968,6 +968,7 @@ |
case SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION: |
case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION: |
case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION: |
+ case SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION: |
case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION: |
case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION: |
case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION: |