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

make digest_alg a digest_oid, it's not needed right now

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15798 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-27 20:31:44 +00:00
parent a7c5af0827
commit 4fa74ad527
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/hx509/crypto.c
View File

@@ -112,7 +112,7 @@ struct signature_alg {
char *name; char *name;
heim_oid *sig_oid; heim_oid *sig_oid;
heim_oid *key_oid; heim_oid *key_oid;
const AlgorithmIdentifier *(*digest_alg)(void); heim_oid *digest_oid;
int flags; int flags;
#define PROVIDE_CONF 1 #define PROVIDE_CONF 1
int (*verify_signature)(const struct signature_alg *, int (*verify_signature)(const struct signature_alg *,
@@ -208,13 +208,12 @@ rsa_verify_signature(const struct signature_alg *sig_alg,
goto out; goto out;
} }
if (sig_alg->digest_alg) { if (sig_alg->digest_oid &&
const AlgorithmIdentifier *a = (*sig_alg->digest_alg)(); heim_oid_cmp(&di.digestAlgorithm.algorithm,
sig_alg->digest_oid) != 0)
if (heim_oid_cmp(&di.digestAlgorithm.algorithm, &a->algorithm) != 0) { {
ret = HX509_CRYPTO_OID_MISMATCH; ret = HX509_CRYPTO_OID_MISMATCH;
goto out; goto out;
}
} }
ret = _hx509_verify_signature(NULL, ret = _hx509_verify_signature(NULL,
@@ -487,7 +486,7 @@ static struct signature_alg rsa_with_sha1_alg = {
"rsa-with-sha1", "rsa-with-sha1",
&sha1WithRSAEncryption_oid, &sha1WithRSAEncryption_oid,
&rsaEncryption_oid, &rsaEncryption_oid,
hx509_signature_sha1, &id_sha1_oid,
PROVIDE_CONF, PROVIDE_CONF,
rsa_verify_signature, rsa_verify_signature,
rsa_create_signature, rsa_create_signature,
@@ -498,7 +497,7 @@ static struct signature_alg rsa_with_md5_alg = {
"rsa-with-md5", "rsa-with-md5",
&md5WithRSAEncryption_oid, &md5WithRSAEncryption_oid,
&rsaEncryption_oid, &rsaEncryption_oid,
hx509_signature_md5, &id_md5_oid,
PROVIDE_CONF, PROVIDE_CONF,
rsa_verify_signature, rsa_verify_signature,
rsa_create_signature, rsa_create_signature,
@@ -509,7 +508,7 @@ static struct signature_alg rsa_with_md2_alg = {
"rsa-with-md2", "rsa-with-md2",
&md2WithRSAEncryption_oid, &md2WithRSAEncryption_oid,
&rsaEncryption_oid, &rsaEncryption_oid,
hx509_signature_md2, &id_md2_oid,
PROVIDE_CONF, PROVIDE_CONF,
rsa_verify_signature, rsa_verify_signature,
rsa_create_signature, rsa_create_signature,
@@ -520,7 +519,7 @@ static struct signature_alg dsa_sha1_alg = {
"dsa-with-sha1", "dsa-with-sha1",
&id_dsa_with_sha1_oid, &id_dsa_with_sha1_oid,
&id_dsa_oid, &id_dsa_oid,
hx509_signature_sha1, &id_sha1_oid,
PROVIDE_CONF, PROVIDE_CONF,
dsa_verify_signature dsa_verify_signature
}; };
@@ -610,16 +609,6 @@ _hx509_verify_signature(const Certificate *signer,
return (*md->verify_signature)(md, signer, alg, data, sig); return (*md->verify_signature)(md, signer, alg, data, sig);
} }
const AlgorithmIdentifier *
_hx509_digest_signature(const AlgorithmIdentifier *alg)
{
const struct signature_alg *md;
md = find_sig_alg(&alg->algorithm);
if (md && md->digest_alg)
return (*md->digest_alg)();
return NULL;
}
int int
_hx509_create_signature(const hx509_private_key signer, _hx509_create_signature(const hx509_private_key signer,
const AlgorithmIdentifier *alg, const AlgorithmIdentifier *alg,