From 43cbc7f57021176d16dcefb41858f788fcb85333 Mon Sep 17 00:00:00 2001
From: "relyea%netscape.com" <devnull@localhost>
Date: Wed, 20 Sep 2000 20:51:33 +0000
Subject: move PKCS11_Config from a private to public header file.

---
 security/nss/lib/softoken/pkcs11.h   | 8 ++++++++
 security/nss/lib/softoken/softoken.h | 9 ---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/security/nss/lib/softoken/pkcs11.h b/security/nss/lib/softoken/pkcs11.h
index 28fd0cd8e..9ada2625e 100644
--- a/security/nss/lib/softoken/pkcs11.h
+++ b/security/nss/lib/softoken/pkcs11.h
@@ -313,4 +313,12 @@ struct CK_FUNCTION_LIST {
 }
 #endif
 
+/* 
+** Functions called directly by applications to configure the FIPS token.
+*/
+extern void PK11_ConfigurePKCS11(char *man, char *libdes, char *tokdes, 
+		char *ptokdes, char *slotdes, char *pslotdes, char *fslotdes, 
+		char *fpslotdes, int minPwd, int pwdRequired);
+extern void PK11_ConfigureFIPS(char *slotdes, char *pslotdes);
+
 #endif
diff --git a/security/nss/lib/softoken/softoken.h b/security/nss/lib/softoken/softoken.h
index 733fdbede..b13a93461 100644
--- a/security/nss/lib/softoken/softoken.h
+++ b/security/nss/lib/softoken/softoken.h
@@ -130,15 +130,6 @@ SECStatus RSA_DecryptRaw(SECKEYLowPrivateKey *key, unsigned char *output,
     			     unsigned int max_output_len,
 			     unsigned char *input, unsigned int input_len);
 
-
-/* 
-** Functions called directly by applications to configure the FIPS token.
-*/
-extern void PK11_ConfigurePKCS11(char *man, char *libdes, char *tokdes, 
-		char *ptokdes, char *slotdes, char *pslotdes, char *fslotdes, 
-		char *fpslotdes, int minPwd, int pwdRequired);
-extern void PK11_ConfigureFIPS(char *slotdes, char *pslotdes);
-
 /*
 ** Prepare a buffer for DES encryption, growing to the appropriate boundary,
 ** filling with the appropriate padding.
-- 
cgit v1.2.1