summaryrefslogtreecommitdiff
path: root/security/nss/lib/jar
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/lib/jar
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/lib/jar')
-rw-r--r--security/nss/lib/jar/jarfile.c1
-rw-r--r--security/nss/lib/jar/jarsign.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/security/nss/lib/jar/jarfile.c b/security/nss/lib/jar/jarfile.c
index 5f5b0e67f..3ddb3341a 100644
--- a/security/nss/lib/jar/jarfile.c
+++ b/security/nss/lib/jar/jarfile.c
@@ -51,6 +51,7 @@
#include "sys/stat.h"
#endif
+#include "sechash.h" /* for HASH_GetHashObject() */
/* extracting */
diff --git a/security/nss/lib/jar/jarsign.c b/security/nss/lib/jar/jarsign.c
index d03f980b0..5aa8bcc00 100644
--- a/security/nss/lib/jar/jarsign.c
+++ b/security/nss/lib/jar/jarsign.c
@@ -48,6 +48,7 @@
#endif
#include "pk11func.h"
+#include "sechash.h"
/* from libevent.h */
typedef void (*ETVoidPtrFunc) (void * data);
@@ -259,7 +260,7 @@ int jar_create_pk7
{
int nb;
unsigned char buffer [4096], digestdata[32];
- SECHashObject *hashObj;
+ const SECHashObject *hashObj;
void *hashcx;
unsigned int len;
@@ -276,7 +277,7 @@ int jar_create_pk7
return JAR_ERR_GENERAL;
/* we sign with SHA */
- hashObj = &SECHashObjects [HASH_AlgSHA1];
+ hashObj = HASH_GetHashObject(HASH_AlgSHA1);
hashcx = (* hashObj->create)();
if (hashcx == NULL)