geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove commented code for BINARY Secrets

Browse Source
This commit is contained in:
Jim Norman
2006-01-03 18:07:30 +00:00
parent c77c27593e
commit ee00b0f0a5
3 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
c_micasadk/sscs_ndk.c
View File

@@ -755,7 +755,6 @@ miCASAOpenSecretStoreCache
/* ############################## CODE STARTS HERE ############################ */
searchKey.srchKey[0] = NSSCS_ENUM_DELIM;
searchKey.srchKeyLen = sscs_Utf8Strlen(searchKey.srchKey) + 1;
@@ -2671,7 +2670,7 @@ miCASAGetCredential
uint32_t ssFlags, // IN
SSCS_SECRET_ID_T * appSecretID, // IN
SSCS_SECRET_ID_T * sharedSecretID, // Optional IN
int32_t * credentialType, // IN/OUT
uint32_t * credentialType, // IN/OUT
void * credential, // OUT
SSCS_EXT_T * ext // Reserved
)
@@ -2709,44 +2708,42 @@ miCASAGetCredential
store.version = 1;
context = miCASAOpenSecretStoreCache(&store, ssFlags, NULL);
/*
if (*credentialType == SSCS_CRED_TYPE_BINARY_F)
{
// first check appSecretID
rcode = miCASAReadBinaryKey(
context,
ssFlags,
&kc,
appSecretID,
binaryCred->id,
binaryCred->idLen,
binaryCred->data,
binaryCred->dataLen,
NULL,
&bytesRequired,
ext);
context,
ssFlags,
&kc,
appSecretID,
binaryCred->id,
binaryCred->idLen,
binaryCred->data,
binaryCred->dataLen,
NULL,
&bytesRequired,
ext);
if ((rcode != NSSCS_SUCCESS) && (sharedSecretID != NULL))
{
// try shared if set
rcode = miCASAReadBinaryKey(
context,
ssFlags,
&kc,
sharedSecretID,
binaryCred->id,
binaryCred->idLen,
binaryCred->data,
binaryCred->dataLen,
NULL,
&bytesRequired,
ext);
context,
ssFlags,
&kc,
sharedSecretID,
binaryCred->id,
binaryCred->idLen,
binaryCred->data,
binaryCred->dataLen,
NULL,
&bytesRequired,
ext);
}
miCASACloseSecretStoreCache(context, ssFlags, NULL);
return rcode;
}
*/
// create a SHS Handle
secretHandle = miCASA_CreateSHSHandle();
@@ -2905,6 +2902,7 @@ miCASASetCredential
SSCS_BASIC_CREDENTIAL *basicCred;
SSCS_BINARY_CREDENTIAL *binaryCred;
// check params
if ((appSecretID == NULL) || (credential == NULL))
{
@@ -2927,7 +2925,7 @@ miCASASetCredential
sscs_Utf8Strcpy(kc.keychainID, SSCS_SESSION_KEY_CHAIN_ID);
kc.len = SSCS_S_KC_ID_CHARS;
/*
if (credentialType == SSCS_CRED_TYPE_BINARY_F)
{
binaryCred = (SSCS_BINARY_CREDENTIAL *)credential;
@@ -2937,23 +2935,23 @@ miCASASetCredential
// set apps binary key
rcode = miCASAWriteBinaryKey(
context,
ssFlags,
&kc,
appSecretID,
binaryCred->id,
binaryCred->idLen,
binaryCred->data,
binaryCred->dataLen,
NULL,
ext);
context,
ssFlags,
&kc,
appSecretID,
binaryCred->id,
binaryCred->idLen,
binaryCred->data,
binaryCred->dataLen,
NULL,
ext);
miCASACloseSecretStoreCache(context, ssFlags, NULL);
return rcode;
}
else
*/
basicCred = (SSCS_BASIC_CREDENTIAL *)credential;