denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated medsrv and test to new fingerprint/encoding API

Browse Source
This commit is contained in:
Martin Willi
2009-08-26 11:23:55 +02:00
parent 1cd0d7969a
commit 9c3d2b3d60
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/medsrv/controller/peer_controller.c
+9 -5
View File
@@ -121,8 +121,7 @@ static bool parse_public_key(private_peer_controller_t *this,
chunk_t *encoding, chunk_t *keyid)
{
public_key_t *public;
identification_t *id;
chunk_t blob;
chunk_t blob, id;
if (!public_key || *public_key == '\0')
{
@@ -140,11 +139,16 @@ static bool parse_public_key(private_peer_controller_t *this,
return FALSE;
}
/* TODO: use get_encoding() with an encoding type */
if (!public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &id) ||
!public->get_encoding(public, KEY_PUB_ASN1_DER, &blob))
{
request->setf(request, "error=Encoding public key failed.");
return FALSE;
}
*keyid = chunk_clone(id);
*encoding = asn1_wrap(ASN1_SEQUENCE, "cm",
asn1_algorithmIdentifier(OID_RSA_ENCRYPTION),
asn1_bitstring("m", public->get_encoding(public)));
id = public->get_id(public, ID_PUBKEY_SHA1);
*keyid = chunk_clone(id->get_encoding(id));
asn1_bitstring("m", blob));
public->destroy(public);
return TRUE;
}