bb7974ac11
address of an external variable that comes from another DLL. This is a fundamental difference between WIN32 DLLs and Unix DSOs. So, for every SEC_ASN1Template inside of libnss3 that is referenced by other templates outside of libnss3, a new "chooser" function was created that returns the address of that template. For WIN32, the templates outside of libnss3 access libnss3's templates by the chooser function rather than by direct reference. Some simple macros allow Unix to continue to use direct references, avoiding the extra function calls. With these changes, all.sh (qa script) passes all tests on NT with DLLs. Modified Files: cmd/checkcert/checkcert.c cmd/lib/secutil.c lib/asn1/asn1t.h lib/certdb/certdb.c lib/certdb/certt.h lib/certdb/crl.c lib/certhigh/certreq.c lib/crmf/asn1cmn.c lib/crmf/crmfcont.c lib/crmf/crmftmpl.c lib/cryptohi/secsign.c lib/nss/nss.def lib/pkcs12/p12local.c lib/pkcs12/p12tmpl.c lib/pkcs7/certread.c lib/pkcs7/p7decode.c lib/pkcs7/p7local.c lib/smime/cmsasn1.c lib/smime/cmsattr.c lib/smime/cmspubkey.c lib/smime/cmssigdata.c lib/smime/smimeutil.c lib/softoken/keydb.c lib/softoken/keydbt.h lib/util/secalgid.c lib/util/secasn1.h lib/util/secasn1d.c lib/util/secasn1t.h lib/util/secasn1u.c lib/util/secdig.c lib/util/secdig.h lib/util/secoid.h git-svn-id: svn://10.0.0.236/trunk@84523 18797224-902f-48f8-a5cc-f745e15eee43
100 lines
3.8 KiB
C
100 lines
3.8 KiB
C
/*
|
|
* The contents of this file are subject to the Mozilla Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is the Netscape security libraries.
|
|
*
|
|
* The Initial Developer of the Original Code is Netscape
|
|
* Communications Corporation. Portions created by Netscape are
|
|
* Copyright (C) 1994-2000 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
*
|
|
* Alternatively, the contents of this file may be used under the
|
|
* terms of the GNU General Public License Version 2 or later (the
|
|
* "GPL"), in which case the provisions of the GPL are applicable
|
|
* instead of those above. If you wish to allow use of your
|
|
* version of this file only under the terms of the GPL and not to
|
|
* allow others to use your version of this file under the MPL,
|
|
* indicate your decision by deleting the provisions above and
|
|
* replace them with the notice and other provisions required by
|
|
* the GPL. If you do not delete the provisions above, a recipient
|
|
* may use your version of this file under either the MPL or the
|
|
* GPL.
|
|
*
|
|
* keydbt.h - private data structures for the private key library
|
|
*
|
|
* $Id: keydbt.h,v 1.2 2001-01-07 08:13:10 nelsonb%netscape.com Exp $
|
|
*/
|
|
|
|
#ifndef _KEYDBT_H_
|
|
#define _KEYDBT_H_
|
|
|
|
#include "prtypes.h"
|
|
#include "plarena.h"
|
|
#include "secitem.h"
|
|
#include "secasn1t.h"
|
|
#include "secmodt.h"
|
|
#include "pkcs11t.h"
|
|
|
|
|
|
/*
|
|
* a key in/for the data base
|
|
*/
|
|
struct SECKEYDBKeyStr {
|
|
PLArenaPool *arena;
|
|
int version;
|
|
char *nickname;
|
|
SECItem salt;
|
|
SECItem derPK;
|
|
};
|
|
typedef struct SECKEYDBKeyStr SECKEYDBKey;
|
|
|
|
typedef struct SECKEYKeyDBHandleStr SECKEYKeyDBHandle;
|
|
|
|
#define PRIVATE_KEY_DB_FILE_VERSION 3
|
|
|
|
#define SEC_PRIVATE_KEY_VERSION 0 /* what we *create* */
|
|
|
|
/*
|
|
** Typedef for callback to get a password "key".
|
|
*/
|
|
typedef SECItem * (* SECKEYGetPasswordKey)(void *arg,
|
|
SECKEYKeyDBHandle *handle);
|
|
|
|
extern const SEC_ASN1Template SECKEY_EncryptedPrivateKeyInfoTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_RSAPublicKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_RSAPrivateKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DSAPublicKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DSAPrivateKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DSAPrivateKeyExportTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DHPrivateKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DHPrivateKeyExportTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_PrivateKeyInfoTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DHPublicKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_DHParamKeyTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_PointerToEncryptedPrivateKeyInfoTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_PointerToPrivateKeyInfoTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_PQGParamsTemplate[];
|
|
extern const SEC_ASN1Template SECKEY_AttributeTemplate[];
|
|
|
|
/* These functions simply return the address of the above-declared templates.
|
|
** This is necessary for Windows DLLs. Sigh.
|
|
*/
|
|
extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PrivateKeyInfoTemplate;
|
|
extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PointerToPrivateKeyInfoTemplate;
|
|
extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_EncryptedPrivateKeyInfoTemplate;
|
|
extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PointerToEncryptedPrivateKeyInfoTemplate;
|
|
extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_DSAPublicKeyTemplate;
|
|
extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_RSAPublicKeyTemplate;
|
|
|
|
#endif /* _KEYDBT_H_ */
|