oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Also select crypto alg based on private key.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24684 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-02-14 04:16:10 +00:00
parent a95073a244
commit 833885be80
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/hx509/crypto.c
View File

@@ -1451,7 +1451,7 @@ find_sig_alg(const heim_oid *oid)
} }
static const AlgorithmIdentifier * static const AlgorithmIdentifier *
sigalg_for_privatekey(const hx509_private_key pk) alg_for_privatekey(const hx509_private_key pk, int type)
{ {
const heim_oid *keytype = pk->ops->key_oid; const heim_oid *keytype = pk->ops->key_oid;
unsigned int i; unsigned int i;
@@ -1464,7 +1464,12 @@ sigalg_for_privatekey(const hx509_private_key pk)
if (pk->ops->available && if (pk->ops->available &&
pk->ops->available(pk, sig_algs[i]->sig_alg) == 0) pk->ops->available(pk, sig_algs[i]->sig_alg) == 0)
continue; continue;
return sig_algs[i]->sig_alg; if (type == HX509_SELECT_PUBLIC_SIG)
return sig_algs[i]->sig_alg;
if (type == HX509_SELECT_DIGEST)
return sig_algs[i]->digest_alg;
return NULL;
} }
return NULL; return NULL;
} }
@@ -2961,12 +2966,15 @@ hx509_crypto_select(const hx509_context context,
if (type == HX509_SELECT_DIGEST) { if (type == HX509_SELECT_DIGEST) {
bits = SIG_DIGEST; bits = SIG_DIGEST;
def = _hx509_crypto_default_digest_alg; if (source)
def = alg_for_privatekey(source, type);
if (def == NULL)
def = _hx509_crypto_default_digest_alg;
} else if (type == HX509_SELECT_PUBLIC_SIG) { } else if (type == HX509_SELECT_PUBLIC_SIG) {
bits = SIG_PUBLIC_SIG; bits = SIG_PUBLIC_SIG;
/* XXX depend on `source´ and `peer´ */ /* XXX depend on `source´ and `peer´ */
if (source) if (source)
def = sigalg_for_privatekey(source); def = alg_for_privatekey(source, type);
if (def == NULL) if (def == NULL)
def = _hx509_crypto_default_sig_alg; def = _hx509_crypto_default_sig_alg;
} else if (type == HX509_SELECT_SECRET_ENC) { } else if (type == HX509_SELECT_SECRET_ENC) {