diff options
| author | wtc%google.com <devnull@localhost> | 2012-02-17 22:08:23 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2012-02-17 22:08:23 +0000 |
| commit | 0015589b221e7fcb283082a30cccf965d3e73c58 (patch) | |
| tree | f400bc85477168655b227acba73dec296ceafacc /security | |
| parent | 703bb7f21e01894e58ad932a891fa242a309915c (diff) | |
| download | nss-hg-0015589b221e7fcb283082a30cccf965d3e73c58.tar.gz | |
Bug 699672: Make the SEC_ASN1Template declarations C++ safe. r=rrelyea.
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/softoken/secmodt.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/security/nss/lib/softoken/secmodt.h b/security/nss/lib/softoken/secmodt.h index 1500d0f46..5a75dd0e5 100644 --- a/security/nss/lib/softoken/secmodt.h +++ b/security/nss/lib/softoken/secmodt.h @@ -42,15 +42,19 @@ #include "secasn1.h" #include "pkcs11t.h" +SEC_BEGIN_PROTOS + /* find a better home for these... */ extern const SEC_ASN1Template SECKEY_PointerToEncryptedPrivateKeyInfoTemplate[]; -extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PointerToEncryptedPrivateKeyInfoTemplate; +SEC_ASN1_CHOOSER_DECLARE(SECKEY_PointerToEncryptedPrivateKeyInfoTemplate) extern const SEC_ASN1Template SECKEY_EncryptedPrivateKeyInfoTemplate[]; -extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_EncryptedPrivateKeyInfoTemplate; +SEC_ASN1_CHOOSER_DECLARE(SECKEY_EncryptedPrivateKeyInfoTemplate) extern const SEC_ASN1Template SECKEY_PrivateKeyInfoTemplate[]; -extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PrivateKeyInfoTemplate; +SEC_ASN1_CHOOSER_DECLARE(SECKEY_PrivateKeyInfoTemplate) extern const SEC_ASN1Template SECKEY_PointerToPrivateKeyInfoTemplate[]; -extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PointerToPrivateKeyInfoTemplate; +SEC_ASN1_CHOOSER_DECLARE(SECKEY_PointerToPrivateKeyInfoTemplate) + +SEC_END_PROTOS /* PKCS11 needs to be included */ typedef struct SECMODModuleStr SECMODModule; |