зеркало из https://github.com/mozilla/gecko-dev.git
Removed unused ASN.1 templates and unnecessary declarations.
Modified Files: lowcert.c pcertt.h
This commit is contained in:
Родитель
5489285685
Коммит
80aae405d5
|
@ -34,7 +34,7 @@
|
||||||
/*
|
/*
|
||||||
* Certificate handling code
|
* 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"
|
#include "seccomon.h"
|
||||||
|
@ -47,22 +47,7 @@
|
||||||
#include "secasn1.h"
|
#include "secasn1.h"
|
||||||
#include "secoid.h"
|
#include "secoid.h"
|
||||||
|
|
||||||
/* should have been in a 'util' header */
|
static const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[] = {
|
||||||
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[] = {
|
|
||||||
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWCERTSubjectPublicKeyInfo) },
|
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWCERTSubjectPublicKeyInfo) },
|
||||||
{ SEC_ASN1_INLINE, offsetof(NSSLOWCERTSubjectPublicKeyInfo,algorithm),
|
{ SEC_ASN1_INLINE, offsetof(NSSLOWCERTSubjectPublicKeyInfo,algorithm),
|
||||||
SECOID_AlgorithmIDTemplate },
|
SECOID_AlgorithmIDTemplate },
|
||||||
|
@ -71,48 +56,17 @@ const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[] = {
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
||||||
const SEC_ASN1Template nsslowcert_CertificateTemplate[] = {
|
static const SEC_ASN1Template nsslowcert_RSAPublicKeyTemplate[] = {
|
||||||
{ 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[] = {
|
|
||||||
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPublicKey) },
|
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPublicKey) },
|
||||||
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.modulus), },
|
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.modulus), },
|
||||||
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.publicExponent), },
|
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.publicExponent), },
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
const SEC_ASN1Template nsslowcert_DSAPublicKeyTemplate[] = {
|
static const SEC_ASN1Template nsslowcert_DSAPublicKeyTemplate[] = {
|
||||||
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dsa.publicValue), },
|
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dsa.publicValue), },
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
const SEC_ASN1Template nsslowcert_DHPublicKeyTemplate[] = {
|
static const SEC_ASN1Template nsslowcert_DHPublicKeyTemplate[] = {
|
||||||
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dh.publicValue), },
|
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dh.publicValue), },
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
/*
|
/*
|
||||||
* certt.h - public data structures for the certificate library
|
* 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_
|
#ifndef _PCERTT_H_
|
||||||
#define _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
|
#include "secasn1t.h" /* way down here because I expect template stuff to
|
||||||
* move out of here anyway */
|
* 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
|
* Certificate Database related definitions and data structures
|
||||||
*/
|
*/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче