wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-26 10:27:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

re-introduce old nss im too tired for this

Browse source
This commit is contained in:
wuggy 2026-06-30 06:37:32 +01:00
commit 3a838106b9
2871 changed files with 1374431 additions and 1762417 deletions
Download patch file Download diff file Expand all files Collapse all files

33
security/nss/lib/softoken/sftkpars.c
View file

@ -62,12 +62,10 @@ sftk_parseTokenParameters(char *param, sftk_token_parameters *parsed)
NSSUTIL_HANDLE_STRING_ARG(index, parsed->tokdes, "tokenDescription=", ;)
NSSUTIL_HANDLE_STRING_ARG(index, parsed->updtokdes, "updateTokenDescription=", ;)
NSSUTIL_HANDLE_STRING_ARG(index, parsed->slotdes, "slotDescription=", ;)
NSSUTIL_HANDLE_STRING_ARG(
index, tmp, "minPWLen=",
if (tmp) { parsed->minPW=atoi(tmp); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_STRING_ARG(
index, tmp, "flags=",
if (tmp) { sftk_parseTokenFlags(param,parsed); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_STRING_ARG(index, tmp, "minPWLen=",
if (tmp) { parsed->minPW=atoi(tmp); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_STRING_ARG(index, tmp, "flags=",
if (tmp) { sftk_parseTokenFlags(param,parsed); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_FINAL_ARG(index)
}
return CKR_OK;
@ -156,12 +154,10 @@ sftk_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS)
NSSUTIL_HANDLE_STRING_ARG(index, pupdtokdes, "updateTokenDescription=", ;)
NSSUTIL_HANDLE_STRING_ARG(index, minPW, "minPWLen=", ;)
NSSUTIL_HANDLE_STRING_ARG(
index, tmp, "flags=",
if (tmp) { sftk_parseFlags(param,parsed); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_STRING_ARG(
index, tmp, "tokens=",
if (tmp) { sftk_parseTokens(tmp,parsed); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_STRING_ARG(index, tmp, "flags=",
if (tmp) { sftk_parseFlags(param,parsed); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_STRING_ARG(index, tmp, "tokens=",
if (tmp) { sftk_parseTokens(tmp,parsed); PORT_Free(tmp); tmp = NULL; })
NSSUTIL_HANDLE_FINAL_ARG(index)
}
if (parsed->tokens == NULL) {
@ -253,16 +249,3 @@ sftk_freeParams(sftk_parameters *params)
FREE_CLEAR(params->updatedir);
FREE_CLEAR(params->updateID);
}
PRBool
sftk_RawArgHasFlag(const char *entry, const char *flag, const void *pReserved)
{
CK_C_INITIALIZE_ARGS *init_args = (CK_C_INITIALIZE_ARGS *)pReserved;
/* if we don't have any params, the flag isn't set */
if ((!init_args || !init_args->LibraryParameters)) {
return PR_FALSE;
}
return NSSUTIL_ArgHasFlag(entry, flag, (const char *)init_args->LibraryParameters);
}