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

adapt to rename of oid_cmp to heim_oid_cmp

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13399 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-02-22 17:31:53 +00:00
parent 483b0b78c3
commit 6da4e2989e
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kdc/pkinit.c
View File

@@ -346,7 +346,7 @@ get_dh_param(krb5_context context, SubjectPublicKeyInfo *dh_key_info,
memset(&dhparam, 0, sizeof(dhparam)); memset(&dhparam, 0, sizeof(dhparam));
if (oid_cmp(&dh_key_info->algorithm.algorithm, &heim_dhpublicnumber_oid)) { if (heim_oid_cmp(&dh_key_info->algorithm.algorithm, &heim_dhpublicnumber_oid)) {
krb5_set_error_string(context, krb5_set_error_string(context,
"PKINIT invalid oid in clientPublicValue"); "PKINIT invalid oid in clientPublicValue");
return KRB5_BADMSGTYPE; return KRB5_BADMSGTYPE;
@@ -468,7 +468,7 @@ pk_rd_padata(krb5_context context,
return ret; return ret;
} }
if (oid_cmp(&r.signedAuthPack.contentType, &pkcs7_signed_oid)) { if (heim_oid_cmp(&r.signedAuthPack.contentType, &pkcs7_signed_oid)) {
krb5_set_error_string(context, "PK-AS-REQ invalid content type oid"); krb5_set_error_string(context, "PK-AS-REQ invalid content type oid");
ret = KRB5KRB_ERR_GENERIC; ret = KRB5KRB_ERR_GENERIC;
goto out; goto out;
@@ -491,7 +491,7 @@ pk_rd_padata(krb5_context context,
goto out; goto out;
/* Signature is correct, now verify the signed message */ /* Signature is correct, now verify the signed message */
if (oid_cmp(&eContentType, &heim_pkauthdata_oid)) { if (heim_oid_cmp(&eContentType, &heim_pkauthdata_oid)) {
krb5_set_error_string(context, "got wrong oid for pkauthdata"); krb5_set_error_string(context, "got wrong oid for pkauthdata");
ret = KRB5_BADMSGTYPE; ret = KRB5_BADMSGTYPE;
goto out; goto out;

24
lib/krb5/pkinit.c
View File

@@ -1041,13 +1041,13 @@ _krb5_pk_verify_sign(krb5_context context,
public_key = X509_get_pubkey(cert); public_key = X509_get_pubkey(cert);
/* verify signature */ /* verify signature */
if (oid_cmp(&signer_info->digestAlgorithm.algorithm, if (heim_oid_cmp(&signer_info->digestAlgorithm.algorithm,
&heim_sha1WithRSAEncryption_oid) == 0) &heim_sha1WithRSAEncryption_oid) == 0)
evp_type = EVP_sha1(); evp_type = EVP_sha1();
else if (oid_cmp(&signer_info->digestAlgorithm.algorithm, else if (heim_oid_cmp(&signer_info->digestAlgorithm.algorithm,
&heim_md5WithRSAEncryption_oid) == 0) &heim_md5WithRSAEncryption_oid) == 0)
evp_type = EVP_md5(); evp_type = EVP_md5();
else if (oid_cmp(&signer_info->digestAlgorithm.algorithm, else if (heim_oid_cmp(&signer_info->digestAlgorithm.algorithm,
&heim_sha1_oid) == 0) &heim_sha1_oid) == 0)
evp_type = EVP_sha1(); evp_type = EVP_sha1();
else { else {
@@ -1118,7 +1118,7 @@ get_reply_key(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
size_t size; size_t size;
if (oid_cmp(eContentType, &heim_pkrkeydata_oid) != 0) { if (heim_oid_cmp(eContentType, &heim_pkrkeydata_oid) != 0) {
krb5_set_error_string(context, "PKINIT, reply key, wrong oid"); krb5_set_error_string(context, "PKINIT, reply key, wrong oid");
return KRB5KRB_AP_ERR_MSG_TYPE; return KRB5KRB_AP_ERR_MSG_TYPE;
} }
@@ -1194,7 +1194,7 @@ pk_rd_pa_reply_enckey(krb5_context context,
user_cert = sk_X509_value(ctx->id->cert, 0); user_cert = sk_X509_value(ctx->id->cert, 0);
if (oid_cmp(&pkcs7_enveloped_oid, &rep->contentType)) { if (heim_oid_cmp(&pkcs7_enveloped_oid, &rep->contentType)) {
krb5_set_error_string(context, "Invalid content type"); krb5_set_error_string(context, "Invalid content type");
return EINVAL; return EINVAL;
} }
@@ -1230,7 +1230,7 @@ pk_rd_pa_reply_enckey(krb5_context context,
goto out; goto out;
} }
if (oid_cmp(&heim_rsaEncryption_oid, if (heim_oid_cmp(&heim_rsaEncryption_oid,
&ri->keyEncryptionAlgorithm.algorithm)) { &ri->keyEncryptionAlgorithm.algorithm)) {
krb5_set_error_string(context, "Invalid content type"); krb5_set_error_string(context, "Invalid content type");
return EINVAL; return EINVAL;
@@ -1244,19 +1244,19 @@ pk_rd_pa_reply_enckey(krb5_context context,
/* verify content type */ /* verify content type */
if (context->pkinit_flags & KRB5_PKINIT_WIN2K) { if (context->pkinit_flags & KRB5_PKINIT_WIN2K) {
if (oid_cmp(&ed.encryptedContentInfo.contentType, &pkcs7_data_oid)) { if (heim_oid_cmp(&ed.encryptedContentInfo.contentType, &pkcs7_data_oid)) {
ret = KRB5KRB_AP_ERR_MSG_TYPE; ret = KRB5KRB_AP_ERR_MSG_TYPE;
goto out; goto out;
} }
} else { } else {
if (oid_cmp(&ed.encryptedContentInfo.contentType, &pkcs7_signed_oid)) { if (heim_oid_cmp(&ed.encryptedContentInfo.contentType, &pkcs7_signed_oid)) {
ret = KRB5KRB_AP_ERR_MSG_TYPE; ret = KRB5KRB_AP_ERR_MSG_TYPE;
goto out; goto out;
} }
} }
if (oid_cmp(&ed.encryptedContentInfo.contentEncryptionAlgorithm.algorithm, if (heim_oid_cmp(&ed.encryptedContentInfo.contentEncryptionAlgorithm.algorithm,
&heim_des_ede3_cbc_oid) == 0) { &heim_des_ede3_cbc_oid) == 0) {
/* use des-ede3-cbc */ /* use des-ede3-cbc */
heim_octet_string encryptedContent; heim_octet_string encryptedContent;
@@ -1318,7 +1318,7 @@ pk_rd_pa_reply_enckey(krb5_context context,
goto out; goto out;
} }
if (oid_cmp(&ci.contentType, &pkcs7_signed_oid) == 0) { if (heim_oid_cmp(&ci.contentType, &pkcs7_signed_oid) == 0) {
ret = EINVAL; /* XXX */ ret = EINVAL; /* XXX */
krb5_set_error_string(context, "Invalid content type"); krb5_set_error_string(context, "Invalid content type");
goto out; goto out;
@@ -1384,7 +1384,7 @@ pk_rd_pa_reply_dh(krb5_context context,
krb5_data_zero(&eContent); krb5_data_zero(&eContent);
memset(&kdc_dh_info, 0, sizeof(kdc_dh_info)); memset(&kdc_dh_info, 0, sizeof(kdc_dh_info));
if (oid_cmp(&pkcs7_signed_oid, &rep->contentType)) { if (heim_oid_cmp(&pkcs7_signed_oid, &rep->contentType)) {
krb5_set_error_string(context, "Invalid content type"); krb5_set_error_string(context, "Invalid content type");
return EINVAL; return EINVAL;
} }
@@ -1409,7 +1409,7 @@ pk_rd_pa_reply_dh(krb5_context context,
if (ret) if (ret)
goto out; goto out;
if (oid_cmp(&eContentType, &heim_pkdhkeydata_oid)) { if (heim_oid_cmp(&eContentType, &heim_pkdhkeydata_oid)) {
ret = KRB5KRB_AP_ERR_MSG_TYPE; /* XXX */ ret = KRB5KRB_AP_ERR_MSG_TYPE; /* XXX */
goto out; goto out;
} }