handle PEM RSA PRIVATE KEY files
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17122 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -140,9 +140,12 @@ _hx509_collector_private_key_add(struct hx509_collector *c,
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
ret = copy_octet_string(localKeyId, &key->localKeyId);
|
if (localKeyId) {
|
||||||
if (ret)
|
ret = copy_octet_string(localKeyId, &key->localKeyId);
|
||||||
goto out;
|
if (ret)
|
||||||
|
goto out;
|
||||||
|
} else
|
||||||
|
memset(&key->localKeyId, 0, sizeof(key->localKeyId));
|
||||||
|
|
||||||
c->val.data[c->val.len] = key;
|
c->val.data[c->val.len] = key;
|
||||||
c->val.len++;
|
c->val.len++;
|
||||||
@@ -163,6 +166,9 @@ match_localkeyid(hx509_context context,
|
|||||||
hx509_query q;
|
hx509_query q;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (value->localKeyId.length == 0)
|
||||||
|
return EINVAL;
|
||||||
|
|
||||||
_hx509_query_clear(&q);
|
_hx509_query_clear(&q);
|
||||||
q.match |= HX509_QUERY_MATCH_LOCAL_KEY_ID;
|
q.match |= HX509_QUERY_MATCH_LOCAL_KEY_ID;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user