зеркало из https://github.com/mozilla/pjs.git
Rename HCL to NSS 171027
This commit is contained in:
Родитель
a72f237b40
Коммит
23abcc3a8a
|
@ -851,7 +851,7 @@ Java_org_mozilla_jss_CryptoManager_importCertPackageNative
|
|||
packageLen = (*env)->GetArrayLength(env, packageArray);
|
||||
|
||||
/***************************************************
|
||||
* Decode package with HCL function
|
||||
* Decode package with NSS function
|
||||
***************************************************/
|
||||
status = CERT_DecodeCertPackage((char*) packageBytes,
|
||||
(int) packageLen,
|
||||
|
|
|
@ -78,7 +78,7 @@ public final class PK11KeyPairGenerator
|
|||
if( token.doesAlgorithm( algorithm.getAlgFamily() ) &&
|
||||
token.isWritable() )
|
||||
{
|
||||
// HCL will do the keygen on the internal module
|
||||
// NSS will do the keygen on the internal module
|
||||
// and move the key to the token. We'll say this is
|
||||
// OK for now.
|
||||
mKeygenOnInternalToken = true;
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/*
|
||||
* HCL header files
|
||||
* NSS and NSPR header files
|
||||
*/
|
||||
|
||||
#include <pk11func.h>
|
||||
|
|
|
@ -378,7 +378,7 @@ ER3(SEC_ERROR_OLD_KRL, (SEC_ERROR_BASE + 110),
|
|||
ER3(SEC_ERROR_CKL_CONFLICT, (SEC_ERROR_BASE + 111),
|
||||
"New CKL has different issuer than current CKL. Delete current CKL.")
|
||||
|
||||
#if 0 /* This was defined AFTER HCL 1.5 was released. */
|
||||
#if 0 /* This was defined AFTER NSS 1.5 was released. */
|
||||
ER3(SEC_ERROR_CERT_NOT_IN_NAME_SPACE, (SEC_ERROR_BASE + 112),
|
||||
"The Certifying Authority for this certifcate is not permitted to issue a \
|
||||
certifcate with this name.")
|
||||
|
|
Загрузка…
Ссылка в новой задаче