summaryrefslogtreecommitdiffstats
path: root/chrome/third_party
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 05:08:51 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 05:08:51 +0000
commiteaa60485f027b00047a2e142d9616ede4333a46b (patch)
treeeb20edb20255f8f76d76f3ff4f1399a04a6d9398 /chrome/third_party
parente80f64a0f8ed441443bec21eeb5c732398d11377 (diff)
downloadchromium_src-eaa60485f027b00047a2e142d9616ede4333a46b.zip
chromium_src-eaa60485f027b00047a2e142d9616ede4333a46b.tar.gz
chromium_src-eaa60485f027b00047a2e142d9616ede4333a46b.tar.bz2
Add ECPrivateKey for Elliptic Curve keypair generation.
The implementation uses NSS on all platforms unless USE_OPENSSL is defined (which is only stubbed out in this CL). BUG=88782 TEST=ECPrivateKeyUnitTest Review URL: http://codereview.chromium.org/8413024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/third_party')
-rw-r--r--chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp13
-rw-r--r--chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h8
2 files changed, 7 insertions, 14 deletions
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
index 17b032d..2f9a4e9 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
@@ -49,6 +49,7 @@
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/net/x509_certificate_model.h"
+#include "crypto/scoped_nss_types.h"
#include "grit/generated_resources.h"
#include "net/base/net_util.h"
#include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h"
@@ -583,7 +584,7 @@ std::string ProcessGeneralNames(PRArenaPool* arena,
std::string ProcessAltName(SECItem* extension_data) {
CERTGeneralName* name_list;
- ScopedPRArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
+ crypto::ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
CHECK(arena.get());
name_list = CERT_DecodeAltNameExtension(arena.get(), extension_data);
@@ -595,7 +596,7 @@ std::string ProcessAltName(SECItem* extension_data) {
std::string ProcessSubjectKeyId(SECItem* extension_data) {
SECItem decoded;
- ScopedPRArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
+ crypto::ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
CHECK(arena.get());
std::string rv;
@@ -613,7 +614,7 @@ std::string ProcessSubjectKeyId(SECItem* extension_data) {
std::string ProcessAuthKeyId(SECItem* extension_data) {
CERTAuthKeyID* ret;
- ScopedPRArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
+ crypto::ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
std::string rv;
CHECK(arena.get());
@@ -777,7 +778,7 @@ std::string ProcessCrlDistPoints(SECItem* extension_data) {
{RF_CERTIFICATE_HOLD, IDS_CERT_REVOCATION_REASON_CERTIFICATE_HOLD},
};
- ScopedPRArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
+ crypto::ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
CHECK(arena.get());
crldp = CERT_DecodeCRLDistributionPoints(arena.get(), extension_data);
@@ -824,7 +825,7 @@ std::string ProcessAuthInfoAccess(SECItem* extension_data) {
std::string rv;
CERTAuthInfoAccess** aia;
CERTAuthInfoAccess* desc;
- ScopedPRArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
+ crypto::ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
CHECK(arena.get());
aia = CERT_DecodeAuthInfoAccessExtension(arena.get(), extension_data);
@@ -867,7 +868,7 @@ std::string ProcessIA5String(SECItem* extension_data) {
std::string ProcessBMPString(SECItem* extension_data) {
std::string rv;
SECItem item;
- ScopedPRArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
+ crypto::ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
CHECK(arena.get());
if (SEC_ASN1DecodeItem(arena.get(), &item,
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h
index 8160c7a..71ee1ac 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h
@@ -48,14 +48,6 @@
#include "base/memory/scoped_ptr.h"
#include "net/base/cert_database.h"
-class FreePRArenaPool {
- public:
- inline void operator()(PRArenaPool* x) const {
- PORT_FreeArena(x, PR_FALSE);
- }
-};
-typedef scoped_ptr_malloc<PRArenaPool, FreePRArenaPool> ScopedPRArenaPool;
-
namespace mozilla_security_manager {
extern SECOidTag ms_cert_ext_certtype;