diff options
author | Yves-Alexis Perez <corsac@debian.org> | 2013-08-25 15:37:27 +0200 |
---|---|---|
committer | Yves-Alexis Perez <corsac@debian.org> | 2013-08-25 15:37:27 +0200 |
commit | c7307e752d8f47c68f834e22ee2ce0a14a70e695 (patch) | |
tree | fbb442a20ab54aad511b46a070e65b8d09c22791 /src/libtncif/tncifimv.h | |
parent | f74c6d77c3efb529e7403eeef0613c061eb895b3 (diff) | |
parent | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (diff) | |
download | vyos-strongswan-c7307e752d8f47c68f834e22ee2ce0a14a70e695.tar.gz vyos-strongswan-c7307e752d8f47c68f834e22ee2ce0a14a70e695.zip |
Merge tag 'upstream/5.1.0'
Upstream version 5.1.0
Diffstat (limited to 'src/libtncif/tncifimv.h')
-rw-r--r-- | src/libtncif/tncifimv.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |