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

Fix re-definition of keyex enum

Browse Source
This commit is contained in:
Nicolas Williams
2016-04-16 16:41:59 -05:00
parent b2a78463de
commit 1103fb19df
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdc/pkinit.c
View File

@@ -47,7 +47,7 @@
struct pk_client_params { struct pk_client_params {
enum krb5_pk_type type; enum krb5_pk_type type;
enum { USE_RSA, USE_DH, USE_ECDH } keyex; enum keyex_enum keyex;
union { union {
struct { struct {
BIGNUM *public_key; BIGNUM *public_key;

4
lib/krb5/krb5_locl.h
View File

@@ -389,9 +389,11 @@ enum krb5_pk_type {
PKINIT_27 = 2 PKINIT_27 = 2
}; };
enum keyex_enum { USE_RSA, USE_DH, USE_ECDH };
struct krb5_pk_init_ctx_data { struct krb5_pk_init_ctx_data {
struct krb5_pk_identity *id; struct krb5_pk_identity *id;
enum { USE_RSA, USE_DH, USE_ECDH } keyex; enum keyex_enum keyex;
union { union {
DH *dh; DH *dh;
void *eckey; void *eckey;