diff options
author | Aleksey Sanin <aleksey@src.gnome.org> | 2003-03-02 08:54:14 +0000 |
---|---|---|
committer | Aleksey Sanin <aleksey@src.gnome.org> | 2003-03-02 08:54:14 +0000 |
commit | eea7c9526386852d6c5b1a7a45fcfedb383877ef (patch) | |
tree | e074c927c9b13be0db85facf5f72b3e16354a9ce /src/keysmngr.c | |
parent | 7201e9370e499756a32206428b3a9a8c25561d18 (diff) | |
download | xmlsec1-eea7c9526386852d6c5b1a7a45fcfedb383877ef.tar.gz xmlsec1-eea7c9526386852d6c5b1a7a45fcfedb383877ef.tar.bz2 xmlsec1-eea7c9526386852d6c5b1a7a45fcfedb383877ef.zip |
separated key requirements klass
Diffstat (limited to 'src/keysmngr.c')
-rw-r--r-- | src/keysmngr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/keysmngr.c b/src/keysmngr.c index 490d6197..f9d796b4 100644 --- a/src/keysmngr.c +++ b/src/keysmngr.c @@ -306,7 +306,7 @@ xmlSecSimpleKeysStoreFindKey(xmlSecKeyDataStorePtr store, const xmlChar* name, size = xmlSecPtrListGetSize(list); for(pos = 0; pos < size; ++pos) { key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, pos); - if((key != NULL) && (xmlSecKeyVerify(key, name, keyInfoCtx->keyId, keyInfoCtx->keyType) == 1)) { + if((key != NULL) && (xmlSecKeyMatch(key, name, &(keyInfoCtx->keyReq)) == 1)) { return(key); } } @@ -347,9 +347,9 @@ xmlSecSimpleKeysStoreLoad(xmlSecKeyDataStorePtr store, const char *uri) { } memset(&keyInfoCtx, 0, sizeof(keyInfoCtx)); - keyInfoCtx.keyId = xmlSecKeyDataIdUnknown; - keyInfoCtx.keyType = xmlSecKeyDataTypeAny; - keyInfoCtx.keyUsage = xmlSecKeyDataUsageAny; + keyInfoCtx.keyReq.keyId = xmlSecKeyDataIdUnknown; + keyInfoCtx.keyReq.keyType = xmlSecKeyDataTypeAny; + keyInfoCtx.keyReq.keyUsage = xmlSecKeyDataUsageAny; keyInfoCtx.retrievalsLevel = 0; keyInfoCtx.encKeysLevel = 1; @@ -459,9 +459,9 @@ xmlSecSimpleKeysStoreSave(xmlSecKeyDataStorePtr store, const char *filename, xml memset(&keyInfoCtx, 0, sizeof(keyInfoCtx)); - keyInfoCtx.keyId = xmlSecKeyDataIdUnknown; - keyInfoCtx.keyType = type; - keyInfoCtx.keyUsage = xmlSecKeyDataUsageAny; + keyInfoCtx.keyReq.keyId = xmlSecKeyDataIdUnknown; + keyInfoCtx.keyReq.keyType = type; + keyInfoCtx.keyReq.keyUsage = xmlSecKeyDataUsageAny; keyInfoCtx.retrievalsLevel = 0; keyInfoCtx.encKeysLevel = 1; |