diff options
author | relyea%netscape.com <devnull@localhost> | 2000-09-20 20:51:33 +0000 |
---|---|---|
committer | relyea%netscape.com <devnull@localhost> | 2000-09-20 20:51:33 +0000 |
commit | 43cbc7f57021176d16dcefb41858f788fcb85333 (patch) | |
tree | a70d3fafed9c9c28d3ac44f67348b9de7e6e0be0 | |
parent | 21c49e8641ea059e2b4d61d4f4ab6b556e734027 (diff) | |
download | nss-hg-43cbc7f57021176d16dcefb41858f788fcb85333.tar.gz |
move PKCS11_Config from a private to public header file.
-rw-r--r-- | security/nss/lib/softoken/pkcs11.h | 8 | ||||
-rw-r--r-- | 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. |