diff options
| -rw-r--r-- | src/libcharon/plugins/eap_tnc/eap_tnc.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c | 4 | ||||
| -rw-r--r-- | src/libtncif/tncifimv.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc.c b/src/libcharon/plugins/eap_tnc/eap_tnc.c index 7363ade1d..839425d59 100644 --- a/src/libcharon/plugins/eap_tnc/eap_tnc.c +++ b/src/libcharon/plugins/eap_tnc/eap_tnc.c @@ -74,7 +74,7 @@ METHOD(eap_method_t, initiate, status_t, case EAP_TLS: case EAP_TTLS: case EAP_PEAP: - auth_type = TNC_AUTH_CERT; + auth_type = TNC_AUTH_X509_CERT; break; case EAP_MD5: case EAP_MSCHAPV2: diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c index 8db3731b2..60f6bc3c1 100644 --- a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c +++ b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c @@ -744,11 +744,11 @@ METHOD(tnccs_manager_t, get_attribute, TNC_Result, subject_type = TNC_SUBJECT_USER; break; case ID_RFC822_ADDR: - id_type = TNC_ID_RFC822_ADDR; + id_type = TNC_ID_EMAIL_ADDR; subject_type = TNC_SUBJECT_USER; break; case ID_DER_ASN1_DN: - id_type = TNC_ID_ASN1_DN; + id_type = TNC_ID_X500_DN; subject_type = TNC_SUBJECT_USER; break; default: diff --git a/src/libtncif/tncifimv.h b/src/libtncif/tncifimv.h index 945012dc0..ecd4fd45b 100644 --- a/src/libtncif/tncifimv.h +++ b/src/libtncif/tncifimv.h @@ -217,9 +217,9 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)( #define TNC_ID_IPV4_ADDR 1 #define TNC_ID_IPV6_ADDR 2 #define TNC_ID_FQDN 3 -#define TNC_ID_RFC822_ADDR 4 +#define TNC_ID_EMAIL_ADDR 4 #define TNC_ID_USERNAME 5 -#define TNC_ID_ASN1_DN 6 +#define TNC_ID_X500_DN 6 /* TNC Subject Types */ @@ -230,7 +230,7 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)( /* TNC Authentication Types */ #define TNC_AUTH_UNKNOWN 0 -#define TNC_AUTH_CERT 1 +#define TNC_AUTH_X509_CERT 1 #define TNC_AUTH_PASSWORD 2 #define TNC_AUTH_SIM 3 |