summaryrefslogtreecommitdiff
path: root/security/nss/cmd/addbuiltin
diff options
context:
space:
mode:
authormcgreer%netscape.com <devnull@localhost>2001-01-26 16:45:46 +0000
committermcgreer%netscape.com <devnull@localhost>2001-01-26 16:45:46 +0000
commitebe3e5139105ec94ea31b0a417730619d8d8aa39 (patch)
tree873bbe78aa4ce8e4a931a8bad48b64af147362b9 /security/nss/cmd/addbuiltin
parent7feecc265f9d2d3e840672b31a44b640c33092c6 (diff)
downloadnss-hg-ebe3e5139105ec94ea31b0a417730619d8d8aa39.tar.gz
thought I'd be cool and make it build with DSO's, but alas, need CERT_DecodeTrustString...
Diffstat (limited to 'security/nss/cmd/addbuiltin')
-rw-r--r--security/nss/cmd/addbuiltin/addbuiltin.c9
-rw-r--r--security/nss/cmd/addbuiltin/manifest.mn1
2 files changed, 3 insertions, 7 deletions
diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c
index c876f5ecc..c43b9ec2e 100644
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -40,10 +40,7 @@
#include "nss.h"
#include "cert.h"
#include "secutil.h"
-#include "blapi.h"
-
-extern SECStatus
-CERT_SerialNumberFromDERCert(SECItem *derCert, SECItem *derName);
+#include "pk11func.h"
void dumpbytes(unsigned char *buf, int len)
{
@@ -109,8 +106,8 @@ ConvertCertificate(SECItem *sdder, char *nickname, CERTCertTrust *trust)
dumpbytes(sdder->data,sdder->len);
printf("END\n");
- SHA1_HashBuf(sha1_hash,sdder->data,sdder->len);
- MD5_HashBuf(md5_hash,sdder->data,sdder->len);
+ PK11_HashBuf(SEC_OID_SHA1, sha1_hash, sdder->data, sdder->len);
+ PK11_HashBuf(SEC_OID_MD5, md5_hash, sdder->data, sdder->len);
printf("\n# Trust for Certificate \"%s\"\n",nickname);
printf("CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST\n");
printf("CKA_TOKEN CK_BBOOL CK_TRUE\n");
diff --git a/security/nss/cmd/addbuiltin/manifest.mn b/security/nss/cmd/addbuiltin/manifest.mn
index d8aa03bf1..c664c2d6c 100644
--- a/security/nss/cmd/addbuiltin/manifest.mn
+++ b/security/nss/cmd/addbuiltin/manifest.mn
@@ -47,4 +47,3 @@ REQUIRES = dbm seccmd
PROGRAM = addbuiltin
USE_STATIC_LIBS = 1
-