diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-05-02 21:38:55 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-05-02 21:38:55 +0000 |
| commit | 12474d681ac7d5361a42e28c8d2058aae251da5c (patch) | |
| tree | 0daec0f70f5950f7bf3d0ecd30cfc43705b072f0 | |
| parent | c6cc0ddec65b39581d3f9d0b0d94242b1f052cba (diff) | |
| download | nss-hg-12474d681ac7d5361a42e28c8d2058aae251da5c.tar.gz | |
Bugzilla bug #78528: put the const ASN1 template declarations in certt.h,
secdig.h, and secoid.h inside extern "C" blocks.
(NSS_3_2_BRANCH)
| -rw-r--r-- | security/nss/lib/certdb/certt.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/util/secdig.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/util/secoid.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h index a1facf623..71ad723b1 100644 --- a/security/nss/lib/certdb/certt.h +++ b/security/nss/lib/certdb/certt.h @@ -777,6 +777,8 @@ typedef struct { #include "secasn1t.h" /* way down here because I expect template stuff to * move out of here anyway */ +SEC_BEGIN_PROTOS + extern const SEC_ASN1Template CERT_CertificateRequestTemplate[]; extern const SEC_ASN1Template CERT_CertificateTemplate[]; extern const SEC_ASN1Template SEC_SignedCertificateTemplate[]; @@ -811,4 +813,6 @@ SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate) +SEC_END_PROTOS + #endif /* _CERTT_H_ */ diff --git a/security/nss/lib/util/secdig.h b/security/nss/lib/util/secdig.h index 2b0fb2740..048604554 100644 --- a/security/nss/lib/util/secdig.h +++ b/security/nss/lib/util/secdig.h @@ -44,6 +44,8 @@ #include "secasn1t.h" #include "secdert.h" +SEC_BEGIN_PROTOS + extern const SEC_ASN1Template sgn_DigestInfoTemplate[]; @@ -52,8 +54,6 @@ SEC_ASN1_CHOOSER_DECLARE(sgn_DigestInfoTemplate) extern DERTemplate SGNDigestInfoTemplate[]; -SEC_BEGIN_PROTOS - /****************************************/ /* ** Digest-info functions diff --git a/security/nss/lib/util/secoid.h b/security/nss/lib/util/secoid.h index cd17d7c66..a015e3239 100644 --- a/security/nss/lib/util/secoid.h +++ b/security/nss/lib/util/secoid.h @@ -45,13 +45,13 @@ #include "secoidt.h" #include "secasn1t.h" +SEC_BEGIN_PROTOS + extern const SEC_ASN1Template SECOID_AlgorithmIDTemplate[]; /* This functions simply returns the address of the above-declared template. */ SEC_ASN1_CHOOSER_DECLARE(SECOID_AlgorithmIDTemplate) -SEC_BEGIN_PROTOS - /* * OID handling routines */ |