summaryrefslogtreecommitdiff
path: root/security/nss/cmd/signtool
diff options
context:
space:
mode:
authornelsonb%netscape.com <devnull@localhost>2001-01-05 01:38:26 +0000
committernelsonb%netscape.com <devnull@localhost>2001-01-05 01:38:26 +0000
commit2c37abab0f2d147bcccec46f9d6e2dd71aec2b94 (patch)
treed560ab158deca81666194ba5ad23141a9a8197bd /security/nss/cmd/signtool
parentbdd0ac1e42e583a42e8aa1d7405a35a11df209ef (diff)
downloadnss-hg-2c37abab0f2d147bcccec46f9d6e2dd71aec2b94.tar.gz
Changes to deal with exporting data from Windows DLLs.
SECHashObjects[] is no longer exported. New function HASH_GetHashObject returns pointer to selected const object. SSL statistics are now in a structure whose address is obtained via a call to SSL_GetStatistics(). On NT, the new symbol NSS_USE_STATIC_LIBS must be declared in programs that use the static SSL library. Also, propagate "const" declaration for SECHashObjects.
Diffstat (limited to 'security/nss/cmd/signtool')
-rw-r--r--security/nss/cmd/signtool/sign.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/nss/cmd/signtool/sign.c b/security/nss/cmd/signtool/sign.c
index 58a72ebef..49fc111e9 100644
--- a/security/nss/cmd/signtool/sign.c
+++ b/security/nss/cmd/signtool/sign.c
@@ -35,6 +35,7 @@
#include "zip.h"
#include "prmem.h"
#include "blapi.h"
+#include "sechash.h" /* for HASH_GetHashObject() */
static int create_pk7 (char *dir, char *keyName, int *keyType);
static int jar_find_key_type (CERTCertificate *cert);
@@ -581,7 +582,7 @@ SignFile (FILE *outFile, FILE *inFile, CERTCertificate *cert)
{
int nb;
char ibuf[4096], digestdata[32];
- SECHashObject *hashObj;
+ const SECHashObject *hashObj;
void *hashcx;
unsigned int len;
@@ -593,7 +594,7 @@ SignFile (FILE *outFile, FILE *inFile, CERTCertificate *cert)
return -1;
/* XXX probably want to extend interface to allow other hash algorithms */
- hashObj = &SECHashObjects[HASH_AlgSHA1];
+ hashObj = HASH_GetHashObject(HASH_AlgSHA1);
hashcx = (* hashObj->create)();
if (hashcx == NULL)