diff options
| author | wchang0222%aol.com <devnull@localhost> | 2003-12-19 23:29:43 +0000 |
|---|---|---|
| committer | wchang0222%aol.com <devnull@localhost> | 2003-12-19 23:29:43 +0000 |
| commit | 6106ae96ab6cc4f5ea25ca95191f6d1a8a71d501 (patch) | |
| tree | 221e0c25c4a25b81aaa247184b4734464b2c7e7b | |
| parent | e1d62e340ab8e1c7755663b8ac0922fec70d4787 (diff) | |
| download | nss-hg-6106ae96ab6cc4f5ea25ca95191f6d1a8a71d501.tar.gz | |
PK11_MoveKey was renamed PK11_MoveSymKey. r=relyea.
Modified Files: symkeyutil.c nss.def pk11func.h pk11skey.c
| -rw-r--r-- | security/nss/cmd/symkeyutil/symkeyutil.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.def | 2 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11func.h | 2 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11skey.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/cmd/symkeyutil/symkeyutil.c b/security/nss/cmd/symkeyutil/symkeyutil.c index 5c355e33b..f1f3d1c41 100644 --- a/security/nss/cmd/symkeyutil/symkeyutil.c +++ b/security/nss/cmd/symkeyutil/symkeyutil.c @@ -1093,7 +1093,7 @@ main(int argc, char **argv) goto shutdown; } rv = SECFailure; - newKey = PK11_MoveKey(target, CKA_ENCRYPT, 0, PR_TRUE, symKey); + newKey = PK11_MoveSymKey(target, CKA_ENCRYPT, 0, PR_TRUE, symKey); if (!newKey) { PR_fprintf(PR_STDERR, "%s: Couldn't move the key \n",progName); goto shutdown; diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index b88fd3cdb..f86daa99c 100644 --- a/security/nss/lib/nss/nss.def +++ b/security/nss/lib/nss/nss.def @@ -770,7 +770,7 @@ PK11_DeriveWithFlagsPerm; PK11_ExportEncryptedPrivKeyInfo; PK11_FindSlotsByAliases; PK11_GetSymKeyType; -PK11_MoveKey; +PK11_MoveSymKey; PK11_PubDeriveExtended; PK11_PubUnwrapSymKeyWithFlagsPerm; PK11_UnwrapSymKeyWithFlagsPerm; diff --git a/security/nss/lib/pk11wrap/pk11func.h b/security/nss/lib/pk11wrap/pk11func.h index 179f11960..eea098a99 100644 --- a/security/nss/lib/pk11wrap/pk11func.h +++ b/security/nss/lib/pk11wrap/pk11func.h @@ -304,7 +304,7 @@ SECStatus PK11_WrapSymKey(CK_MECHANISM_TYPE type, SECItem *params, * operation or the flags and making the key permanent at the same time. * If the key is moved to the same slot, operation and flags values are * currently ignored */ -PK11SymKey *PK11_MoveKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, +PK11SymKey *PK11_MoveSymKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, CK_FLAGS flags, PRBool perm, PK11SymKey *symKey); /* * derive a new key from the base key. diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c index 062a22f4a..2cb2c8d29 100644 --- a/security/nss/lib/pk11wrap/pk11skey.c +++ b/security/nss/lib/pk11wrap/pk11skey.c @@ -1428,7 +1428,7 @@ pk11_ForceSlot(PK11SymKey *symKey,CK_MECHANISM_TYPE type, } PK11SymKey * -PK11_MoveKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, +PK11_MoveSymKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, CK_FLAGS flags, PRBool perm, PK11SymKey *symKey) { if (symKey->slot == slot) { |