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

Additional changes for binary secrets

Browse Source
This commit is contained in:
Jim Norman 2005-12-12 20:50:52 +00:00
parent 08038f4b7f
commit 8f36de6bc7
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
c_micasadk/sscs_ndk.c
View File

@ -2711,7 +2711,8 @@ miCASAGetCredential
if (*credentialType == SSCS_CRED_TYPE_BINARY_F) if (*credentialType == SSCS_CRED_TYPE_BINARY_F)
{ {
return miCASAReadBinaryKey( // first check appSecretID
rcode = miCASAReadBinaryKey(
context, context,
ssFlags, ssFlags,
&kc, &kc,
@ -2722,7 +2723,27 @@ miCASAGetCredential
binaryCred->dataLen, binaryCred->dataLen,
NULL, NULL,
&bytesRequired, &bytesRequired,
ext); 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);
}
miCASACloseSecretStoreCache(context, ssFlags, NULL);
return rcode;
} }
// create a SHS Handle // create a SHS Handle
@ -2882,6 +2903,12 @@ miCASASetCredential
SSCS_BASIC_CREDENTIAL *basicCred; SSCS_BASIC_CREDENTIAL *basicCred;
SSCS_BINARY_CREDENTIAL *binaryCred; SSCS_BINARY_CREDENTIAL *binaryCred;
// check params
if ((appSecretID == NULL) || (credential == NULL))
{
return(NSSCS_E_INVALID_PARAM);
}
// open secretStore // open secretStore
sscs_Utf8Strcpy(store.ssName, SSCS_DEFAULT_SECRETSTORE_ID); sscs_Utf8Strcpy(store.ssName, SSCS_DEFAULT_SECRETSTORE_ID);
store.version = 1; store.version = 1;
@ -2903,7 +2930,11 @@ miCASASetCredential
{ {
binaryCred = (SSCS_BINARY_CREDENTIAL *)credential; binaryCred = (SSCS_BINARY_CREDENTIAL *)credential;
return miCASAWriteBinaryKey( // TODO: set shared if passed in
// set apps binary key
rcode = miCASAWriteBinaryKey(
context, context,
ssFlags, ssFlags,
&kc, &kc,
@ -2914,14 +2945,14 @@ miCASASetCredential
binaryCred->dataLen, binaryCred->dataLen,
NULL, NULL,
ext); ext);
miCASACloseSecretStoreCache(context, ssFlags, NULL);
return rcode;
} }
else else
basicCred = (SSCS_BASIC_CREDENTIAL *)credential; basicCred = (SSCS_BASIC_CREDENTIAL *)credential;
// check params
if ((appSecretID == NULL) || (credential == NULL))
{
return(NSSCS_E_INVALID_PARAM);
}
// determine username key name, ie CN, LDAPDN, etc // determine username key name, ie CN, LDAPDN, etc
if (basicCred->unFlags & USERNAME_TYPE_NDS_DN_F) if (basicCred->unFlags & USERNAME_TYPE_NDS_DN_F)