Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
PK11_MoveKey was renamed PK11_MoveSymKey. r=relyea.
Modified Files: symkeyutil.c nss.def pk11func.h pk11skey.c
  • Loading branch information
wchang0222%aol.com committed Dec 19, 2003
1 parent 1b7de2c commit abd1e5b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion security/nss/cmd/symkeyutil/symkeyutil.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion security/nss/lib/nss/nss.def
Expand Up @@ -770,7 +770,7 @@ PK11_DeriveWithFlagsPerm;
PK11_ExportEncryptedPrivKeyInfo;
PK11_FindSlotsByAliases;
PK11_GetSymKeyType;
PK11_MoveKey;
PK11_MoveSymKey;
PK11_PubDeriveExtended;
PK11_PubUnwrapSymKeyWithFlagsPerm;
PK11_UnwrapSymKeyWithFlagsPerm;
Expand Down
2 changes: 1 addition & 1 deletion security/nss/lib/pk11wrap/pk11func.h
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion security/nss/lib/pk11wrap/pk11skey.c
Expand Up @@ -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) {
Expand Down

0 comments on commit abd1e5b

Please sign in to comment.