Aligned AR Identity types to IF-IMV 1.4 R5 draft
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 23 Jun 2013 22:23:50 +0000 (00:23 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 23 Jun 2013 22:23:50 +0000 (00:23 +0200)
src/libcharon/plugins/eap_tnc/eap_tnc.c
src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c
src/libtncif/tncifimv.h

index 7363ade..839425d 100644 (file)
@@ -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:
index 8db3731..60f6bc3 100644 (file)
@@ -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:
index 945012d..ecd4fd4 100644 (file)
@@ -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