← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/pk11wrap/pk11akey.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-31 02:23:43 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100331022343-ck07ylqk8q474x26
Tags: 3.12.6-0ubuntu0.9.10.1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols 
* Enable transitional scheme for SSL renegotiation
  - add 97_SSL_RENEGOTIATE_TRANSITIONAL.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/pk11wrap/pk11akey.c
1894
1894
SECItem*
1895
1895
PK11_DEREncodePublicKey(SECKEYPublicKey *pubk)
1896
1896
{
1897
 
    CERTSubjectPublicKeyInfo *spki=NULL;
1898
 
    SECItem *spkiDER = NULL;
1899
 
 
1900
 
    if( pubk == NULL ) {
1901
 
        return NULL;
1902
 
    }
1903
 
 
1904
 
    /* get the subjectpublickeyinfo */
1905
 
    spki = SECKEY_CreateSubjectPublicKeyInfo(pubk);
1906
 
    if( spki == NULL ) {
1907
 
        goto finish;
1908
 
    }
1909
 
 
1910
 
    /* DER-encode the subjectpublickeyinfo */
1911
 
    spkiDER = SEC_ASN1EncodeItem(NULL /*arena*/, NULL/*dest*/, spki,
1912
 
                    CERT_SubjectPublicKeyInfoTemplate);
1913
 
 
1914
 
finish:
1915
 
    return spkiDER;
 
1897
    return SECKEY_EncodeDERSubjectPublicKeyInfo(pubk);
1916
1898
}
1917
1899
 
1918
1900
char *