diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 19:31:03 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 19:31:03 +0000 |
| commit | 0df4ca0655085d042e824ca39856a2f6fecc15a9 (patch) | |
| tree | f94f715df3a232dd5123638967b5c7ea716c5885 /net/base | |
| parent | aab64e014eb487ca97688c525c680c66eae4646f (diff) | |
| download | chromium_src-0df4ca0655085d042e824ca39856a2f6fecc15a9.zip chromium_src-0df4ca0655085d042e824ca39856a2f6fecc15a9.tar.gz chromium_src-0df4ca0655085d042e824ca39856a2f6fecc15a9.tar.bz2 | |
Improve memory usage of SignCertificate.
Don't allocate from cert->arena the memory that's only needed
inside the SignCertificate function.
R=mattm@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/10335009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/x509_util_nss.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/net/base/x509_util_nss.cc b/net/base/x509_util_nss.cc index b2afe68..08cd7e9 100644 --- a/net/base/x509_util_nss.cc +++ b/net/base/x509_util_nss.cc @@ -142,30 +142,27 @@ bool SignCertificate( *(cert->version.data) = 2; cert->version.len = 1; - SECItem der; - der.len = 0; - der.data = NULL; + SECItem der = { siBuffer, NULL, 0 }; // Use ASN1 DER to encode the cert. void* encode_result = SEC_ASN1EncodeItem( - arena, &der, cert, SEC_ASN1_GET(CERT_CertificateTemplate)); + NULL, &der, cert, SEC_ASN1_GET(CERT_CertificateTemplate)); if (!encode_result) return false; // Allocate space to contain the signed cert. - SECItem* result = SECITEM_AllocItem(arena, NULL, 0); - if (!result) - return false; + SECItem result = { siBuffer, NULL, 0 }; // Sign the ASN1 encoded cert and save it to |result|. - rv = DerSignData(arena, result, &der, key, algo_id); + rv = DerSignData(arena, &result, &der, key, algo_id); + PORT_Free(der.data); if (rv != SECSuccess) { DLOG(ERROR) << "DerSignData: " << PORT_GetError(); return false; } // Save the signed result to the cert. - cert->derCert = *result; + cert->derCert = result; return true; } @@ -178,7 +175,6 @@ bool CreateDomainBoundCertInternal( base::Time not_valid_before, base::Time not_valid_after, std::string* der_cert) { - CERTCertificate* cert = CreateCertificate(public_key, "CN=anonymous.invalid", serial_number, |