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

Drop krb5_pk_identity and rename constants to match global header.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22911 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-04-08 08:16:44 +00:00
parent a5301b2daa
commit 459b3f0a69
1 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/krb5/pkinit.c
View File

@@ -45,8 +45,6 @@ struct krb5_dh_moduli {
#ifdef PKINIT #ifdef PKINIT
#include <heim_asn1.h>
#include <rfc2459_asn1.h>
#include <cms_asn1.h> #include <cms_asn1.h>
#include <pkcs8_asn1.h> #include <pkcs8_asn1.h>
#include <pkcs9_asn1.h> #include <pkcs9_asn1.h>
@@ -56,22 +54,6 @@ struct krb5_dh_moduli {
#include <der.h> #include <der.h>
#include <hx509.h>
enum {
COMPAT_WIN2K = 1,
COMPAT_IETF = 2
};
struct krb5_pk_identity {
hx509_context hx509ctx;
hx509_verify_ctx verify_ctx;
hx509_certs certs;
hx509_certs anchors;
hx509_certs certpool;
hx509_revoke_ctx revokectx;
};
struct krb5_pk_cert { struct krb5_pk_cert {
hx509_cert cert; hx509_cert cert;
}; };
@@ -524,7 +506,7 @@ pk_mk_padata(krb5_context context,
krb5_data_zero(&sd_buf); krb5_data_zero(&sd_buf);
memset(&content_info, 0, sizeof(content_info)); memset(&content_info, 0, sizeof(content_info));
if (ctx->type == COMPAT_WIN2K) { if (ctx->type == PKINIT_WIN2K) {
AuthPack_Win2k ap; AuthPack_Win2k ap;
krb5_timestamp sec; krb5_timestamp sec;
int32_t usec; int32_t usec;
@@ -561,7 +543,7 @@ pk_mk_padata(krb5_context context,
krb5_abortx(context, "internal ASN1 encoder error"); krb5_abortx(context, "internal ASN1 encoder error");
oid = oid_id_pkcs7_data(); oid = oid_id_pkcs7_data();
} else if (ctx->type == COMPAT_IETF) { } else if (ctx->type == PKINIT_27) {
AuthPack ap; AuthPack ap;
memset(&ap, 0, sizeof(ap)); memset(&ap, 0, sizeof(ap));
@@ -599,7 +581,7 @@ pk_mk_padata(krb5_context context,
goto out; goto out;
} }
if (ctx->type == COMPAT_WIN2K) { if (ctx->type == PKINIT_WIN2K) {
PA_PK_AS_REQ_Win2k winreq; PA_PK_AS_REQ_Win2k winreq;
pa_type = KRB5_PADATA_PK_AS_REQ_WIN; pa_type = KRB5_PADATA_PK_AS_REQ_WIN;
@@ -612,7 +594,7 @@ pk_mk_padata(krb5_context context,
&winreq, &size, ret); &winreq, &size, ret);
free_PA_PK_AS_REQ_Win2k(&winreq); free_PA_PK_AS_REQ_Win2k(&winreq);
} else if (ctx->type == COMPAT_IETF) { } else if (ctx->type == PKINIT_27) {
PA_PK_AS_REQ req; PA_PK_AS_REQ req;
pa_type = KRB5_PADATA_PK_AS_REQ; pa_type = KRB5_PADATA_PK_AS_REQ;
@@ -656,7 +638,7 @@ pk_mk_padata(krb5_context context,
if (ret) if (ret)
free(buf.data); free(buf.data);
if (ret == 0 && ctx->type == COMPAT_WIN2K) if (ret == 0 && ctx->type == PKINIT_WIN2K)
krb5_padata_add(context, md, KRB5_PADATA_PK_AS_09_BINDING, NULL, 0); krb5_padata_add(context, md, KRB5_PADATA_PK_AS_09_BINDING, NULL, 0);
out: out:
@@ -691,9 +673,9 @@ _krb5_pk_mk_padata(krb5_context context,
req_body->realm, req_body->realm,
"pkinit_win2k_require_binding", "pkinit_win2k_require_binding",
NULL); NULL);
ctx->type = COMPAT_WIN2K; ctx->type = PKINIT_WIN2K;
} else } else
ctx->type = COMPAT_IETF; ctx->type = PKINIT_27;
ctx->require_eku = ctx->require_eku =
krb5_config_get_bool_default(context, NULL, krb5_config_get_bool_default(context, NULL,
@@ -1031,7 +1013,7 @@ pk_rd_pa_reply_enckey(krb5_context context,
#endif #endif
/* win2k uses ContentInfo */ /* win2k uses ContentInfo */
if (type == COMPAT_WIN2K) { if (type == PKINIT_WIN2K) {
heim_oid type; heim_oid type;
heim_octet_string out; heim_octet_string out;
@@ -1070,7 +1052,7 @@ pk_rd_pa_reply_enckey(krb5_context context,
} }
#if 0 #if 0
if (type == COMPAT_WIN2K) { if (type == PKINIT_WIN2K) {
if (der_heim_oid_cmp(&contentType, oid_id_pkcs7_data()) != 0) { if (der_heim_oid_cmp(&contentType, oid_id_pkcs7_data()) != 0) {
krb5_set_error_string(context, "PKINIT: reply key, wrong oid"); krb5_set_error_string(context, "PKINIT: reply key, wrong oid");
ret = KRB5KRB_AP_ERR_MSG_TYPE; ret = KRB5KRB_AP_ERR_MSG_TYPE;
@@ -1086,12 +1068,12 @@ pk_rd_pa_reply_enckey(krb5_context context,
#endif #endif
switch(type) { switch(type) {
case COMPAT_WIN2K: case PKINIT_WIN2K:
ret = get_reply_key(context, &content, req_buffer, key); ret = get_reply_key(context, &content, req_buffer, key);
if (ret != 0 && ctx->require_binding == 0) if (ret != 0 && ctx->require_binding == 0)
ret = get_reply_key_win(context, &content, nonce, key); ret = get_reply_key_win(context, &content, nonce, key);
break; break;
case COMPAT_IETF: case PKINIT_27:
ret = get_reply_key(context, &content, req_buffer, key); ret = get_reply_key(context, &content, req_buffer, key);
break; break;
} }
@@ -1298,7 +1280,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
size_t size; size_t size;
/* Check for IETF PK-INIT first */ /* Check for IETF PK-INIT first */
if (ctx->type == COMPAT_IETF) { if (ctx->type == PKINIT_27) {
PA_PK_AS_REP rep; PA_PK_AS_REP rep;
heim_octet_string os, data; heim_octet_string os, data;
heim_oid oid; heim_oid oid;
@@ -1346,7 +1328,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
nonce, pa, key); nonce, pa, key);
break; break;
case choice_PA_PK_AS_REP_encKeyPack: case choice_PA_PK_AS_REP_encKeyPack:
ret = pk_rd_pa_reply_enckey(context, COMPAT_IETF, &data, &oid, realm, ret = pk_rd_pa_reply_enckey(context, PKINIT_27, &data, &oid, realm,
ctx, etype, hi, nonce, req_buffer, pa, key); ctx, etype, hi, nonce, req_buffer, pa, key);
break; break;
default: default:
@@ -1356,7 +1338,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
der_free_oid(&oid); der_free_oid(&oid);
free_PA_PK_AS_REP(&rep); free_PA_PK_AS_REP(&rep);
} else if (ctx->type == COMPAT_WIN2K) { } else if (ctx->type == PKINIT_WIN2K) {
PA_PK_AS_REP_Win2k w2krep; PA_PK_AS_REP_Win2k w2krep;
/* Check for Windows encoding of the AS-REP pa data */ /* Check for Windows encoding of the AS-REP pa data */
@@ -1395,7 +1377,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
return ret; return ret;
} }
ret = pk_rd_pa_reply_enckey(context, COMPAT_WIN2K, &data, &oid, realm, ret = pk_rd_pa_reply_enckey(context, PKINIT_WIN2K, &data, &oid, realm,
ctx, etype, hi, nonce, req_buffer, pa, key); ctx, etype, hi, nonce, req_buffer, pa, key);
der_free_octet_string(&data); der_free_octet_string(&data);
der_free_oid(&oid); der_free_oid(&oid);