s/heim_big_integer/heim_integer/
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13355 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
18
kdc/pkinit.c
18
kdc/pkinit.c
@@ -313,7 +313,7 @@ generate_dh_keyblock(krb5_context context, pk_client_params *client_params,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static BIGNUM *
|
static BIGNUM *
|
||||||
big_integer_to_BN(krb5_context context, const char *field, heim_big_integer *f)
|
integer_to_BN(krb5_context context, const char *field, heim_integer *f)
|
||||||
{
|
{
|
||||||
unsigned char *p = f->data;
|
unsigned char *p = f->data;
|
||||||
ASN1_INTEGER *i;
|
ASN1_INTEGER *i;
|
||||||
@@ -378,24 +378,24 @@ get_dh_param(krb5_context context, SubjectPublicKeyInfo *dh_key_info,
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
ret = KRB5_BADMSGTYPE;
|
ret = KRB5_BADMSGTYPE;
|
||||||
dh->p = big_integer_to_BN(context, "DH prime", &dhparam.p);
|
dh->p = integer_to_BN(context, "DH prime", &dhparam.p);
|
||||||
if (dh->p == NULL)
|
if (dh->p == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
dh->g = big_integer_to_BN(context, "DH base", &dhparam.g);
|
dh->g = integer_to_BN(context, "DH base", &dhparam.g);
|
||||||
if (dh->g == NULL)
|
if (dh->g == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
dh->q = big_integer_to_BN(context, "DH p-1 factor", &dhparam.q);
|
dh->q = integer_to_BN(context, "DH p-1 factor", &dhparam.q);
|
||||||
if (dh->g == NULL)
|
if (dh->g == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
{
|
{
|
||||||
heim_big_integer glue;
|
heim_integer glue;
|
||||||
glue.data = dh_key_info->subjectPublicKey.data;
|
glue.data = dh_key_info->subjectPublicKey.data;
|
||||||
glue.length = dh_key_info->subjectPublicKey.length;
|
glue.length = dh_key_info->subjectPublicKey.length;
|
||||||
|
|
||||||
client_params->dh_public_key = big_integer_to_BN(context,
|
client_params->dh_public_key = integer_to_BN(context,
|
||||||
"subjectPublicKey",
|
"subjectPublicKey",
|
||||||
&glue);
|
&glue);
|
||||||
if (client_params->dh_public_key == NULL) {
|
if (client_params->dh_public_key == NULL) {
|
||||||
krb5_clear_error_string(context);
|
krb5_clear_error_string(context);
|
||||||
goto out;
|
goto out;
|
||||||
@@ -607,7 +607,7 @@ pk_mk_pa_reply_enckey(krb5_context context,
|
|||||||
krb5_enctype enctype = ETYPE_DES3_CBC_NONE;
|
krb5_enctype enctype = ETYPE_DES3_CBC_NONE;
|
||||||
heim_oid *enc_type_oid = NULL;
|
heim_oid *enc_type_oid = NULL;
|
||||||
X509_NAME *issuer_name;
|
X509_NAME *issuer_name;
|
||||||
heim_big_integer *serial;
|
heim_integer *serial;
|
||||||
|
|
||||||
size_t size;
|
size_t size;
|
||||||
|
|
||||||
|
@@ -162,7 +162,7 @@ _krb5_pk_create_sign(krb5_context context,
|
|||||||
const heim_oid *digest_oid;
|
const heim_oid *digest_oid;
|
||||||
SignerInfo *signer_info;
|
SignerInfo *signer_info;
|
||||||
X509 *user_cert;
|
X509 *user_cert;
|
||||||
heim_big_integer *serial;
|
heim_integer *serial;
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
krb5_data buf;
|
krb5_data buf;
|
||||||
SignedData sd;
|
SignedData sd;
|
||||||
@@ -375,7 +375,7 @@ _krb5_pk_create_sign(krb5_context context,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
BN_to_integer(krb5_context context, BIGNUM *bn, heim_big_integer *integer)
|
BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer)
|
||||||
{
|
{
|
||||||
ASN1_INTEGER *i;
|
ASN1_INTEGER *i;
|
||||||
int ret;
|
int ret;
|
||||||
@@ -704,7 +704,7 @@ pk_peer_compare(krb5_context context,
|
|||||||
switch (peer1->element) {
|
switch (peer1->element) {
|
||||||
case choice_SignerIdentifier_issuerAndSerialNumber: {
|
case choice_SignerIdentifier_issuerAndSerialNumber: {
|
||||||
ASN1_INTEGER *i;
|
ASN1_INTEGER *i;
|
||||||
const heim_big_integer *serial;
|
const heim_integer *serial;
|
||||||
X509_NAME *name;
|
X509_NAME *name;
|
||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
Reference in New Issue
Block a user