From 80aae405d56ded120e1de0ebd5a803ad03e93705 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Thu, 25 Jul 2002 03:59:38 +0000
Subject: [PATCH] Removed unused ASN.1 templates and unnecessary declarations.
 Modified Files: lowcert.c pcertt.h

---
 security/nss/lib/softoken/lowcert.c | 56 +++--------------------------
 security/nss/lib/softoken/pcertt.h  | 12 +------
 2 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/security/nss/lib/softoken/lowcert.c b/security/nss/lib/softoken/lowcert.c
index f186314b7aef..8b76668add10 100644
--- a/security/nss/lib/softoken/lowcert.c
+++ b/security/nss/lib/softoken/lowcert.c
@@ -34,7 +34,7 @@
 /*
  * Certificate handling code
  *
- * $Id: lowcert.c,v 1.10 2002/07/13 02:45:04 relyea%netscape.com Exp $
+ * $Id: lowcert.c,v 1.11 2002/07/25 03:59:38 wtc%netscape.com Exp $
  */
 
 #include "seccomon.h"
@@ -47,22 +47,7 @@
 #include "secasn1.h"
 #include "secoid.h"
 
-/* should have been in a 'util' header */
-extern const SEC_ASN1Template CERT_ValidityTemplate[];
-
-static const SEC_ASN1Template nsslowcert_CertKeyTemplate[] = {
-    { SEC_ASN1_SEQUENCE,
-	  0, NULL, sizeof(NSSLOWCERTCertKey) },
-    { SEC_ASN1_EXPLICIT | SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | 
-	  SEC_ASN1_CONTEXT_SPECIFIC | 0, 0, SEC_SkipTemplate },	/* version */ 
-    { SEC_ASN1_INTEGER, offsetof(NSSLOWCERTCertKey,serialNumber) },
-    { SEC_ASN1_SKIP },		/* signature algorithm */
-    { SEC_ASN1_ANY, offsetof(NSSLOWCERTCertKey,derIssuer) },
-    { SEC_ASN1_SKIP_REST },
-    { 0 }
-};
-
-const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[] = {
+static const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[] = {
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWCERTSubjectPublicKeyInfo) },
     { SEC_ASN1_INLINE, offsetof(NSSLOWCERTSubjectPublicKeyInfo,algorithm),
           SECOID_AlgorithmIDTemplate },
@@ -71,48 +56,17 @@ const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[] = {
     { 0, }
 };
 
-const SEC_ASN1Template nsslowcert_CertificateTemplate[] = {
-    { SEC_ASN1_SEQUENCE,
-      0, NULL, sizeof(NSSLOWCERTCertificate) },
-    { SEC_ASN1_EXPLICIT | SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED |
-          SEC_ASN1_CONTEXT_SPECIFIC | 0, 0, SEC_SkipTemplate }, /* version */
-    { SEC_ASN1_INTEGER, offsetof(NSSLOWCERTCertificate,serialNumber) },
-    { SEC_ASN1_SKIP }, /* Signature algorithm */
-    { SEC_ASN1_ANY, offsetof(NSSLOWCERTCertificate,derIssuer) },
-    { SEC_ASN1_INLINE,
-          offsetof(NSSLOWCERTCertificate,validity),
-          CERT_ValidityTemplate },
-    { SEC_ASN1_ANY, offsetof(NSSLOWCERTCertificate,derSubject) },
-    { SEC_ASN1_INLINE,
-          offsetof(NSSLOWCERTCertificate,subjectPublicKeyInfo),
-          nsslowcert_SubjectPublicKeyInfoTemplate },
-    { SEC_ASN1_SKIP_REST },
-    { 0 }
-};
-const SEC_ASN1Template nsslowcert_SignedCertificateTemplate[] =
-{
-    { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWCERTCertificate) },
-    { SEC_ASN1_INLINE, 0, nsslowcert_CertificateTemplate },
-    { SEC_ASN1_SKIP_REST },
-    { 0 }
-};
-const SEC_ASN1Template nsslowcert_SignedDataTemplate[] = {
-    { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWCERTSignedData) },
-    { SEC_ASN1_ANY, offsetof(NSSLOWCERTSignedData,data), },
-    { SEC_ASN1_SKIP_REST },
-    { 0, }
-};
-const SEC_ASN1Template nsslowcert_RSAPublicKeyTemplate[] = {
+static const SEC_ASN1Template nsslowcert_RSAPublicKeyTemplate[] = {
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPublicKey) },
     { SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.modulus), },
     { SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.publicExponent), },
     { 0, }
 };
-const SEC_ASN1Template nsslowcert_DSAPublicKeyTemplate[] = {
+static const SEC_ASN1Template nsslowcert_DSAPublicKeyTemplate[] = {
     { SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dsa.publicValue), },
     { 0, }
 };
-const SEC_ASN1Template nsslowcert_DHPublicKeyTemplate[] = {
+static const SEC_ASN1Template nsslowcert_DHPublicKeyTemplate[] = {
     { SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dh.publicValue), },
     { 0, }
 };
diff --git a/security/nss/lib/softoken/pcertt.h b/security/nss/lib/softoken/pcertt.h
index 0d2249075ad7..ce6e24d2022e 100644
--- a/security/nss/lib/softoken/pcertt.h
+++ b/security/nss/lib/softoken/pcertt.h
@@ -33,7 +33,7 @@
 /*
  * certt.h - public data structures for the certificate library
  *
- * $Id: pcertt.h,v 1.7 2002/07/13 02:45:04 relyea%netscape.com Exp $
+ * $Id: pcertt.h,v 1.8 2002/07/25 03:59:38 wtc%netscape.com Exp $
  */
 #ifndef _PCERTT_H_
 #define _PCERTT_H_
@@ -180,16 +180,6 @@ typedef char * (*NSSLOWCERTDBNameFunc)(void *arg, int dbVersion);
 #include "secasn1t.h"	/* way down here because I expect template stuff to
 			 * move out of here anyway */
 
-SEC_BEGIN_PROTOS
-
-extern const SEC_ASN1Template nsslowcert_CertificateTemplate[];
-extern const SEC_ASN1Template nsslowcert_SignedDataTemplate[];
-extern const SEC_ASN1Template NSSLOWKEY_PublicKeyTemplate[];
-extern const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[];
-extern const SEC_ASN1Template nsslowcert_ValidityTemplate[];
-
-SEC_END_PROTOS
-
 /*
  * Certificate Database related definitions and data structures
  */