diff options
author | Tobias Brunner <tobias@strongswan.org> | 2015-07-31 17:14:44 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2015-08-17 11:49:12 +0200 |
commit | 017dbb1c5e12ed2e7457116273d60dc4d9eb29d6 (patch) | |
tree | d6f8c8f71d46d0d44ea443b5ebfdac2862788b22 /src/libstrongswan | |
parent | 4a2e17997f734ae8c4a5abf7fbfbec6620bff6e7 (diff) | |
download | strongswan-017dbb1c5e12ed2e7457116273d60dc4d9eb29d6.tar.bz2 strongswan-017dbb1c5e12ed2e7457116273d60dc4d9eb29d6.tar.xz |
identification: Remove unused ID_USER_ID type
Diffstat (limited to 'src/libstrongswan')
-rw-r--r-- | src/libstrongswan/utils/identification.c | 9 | ||||
-rw-r--r-- | src/libstrongswan/utils/identification.h | 5 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c index 7c8a4bb79..da23d143c 100644 --- a/src/libstrongswan/utils/identification.c +++ b/src/libstrongswan/utils/identification.c @@ -47,10 +47,9 @@ ENUM_BEGIN(id_type_names, ID_ANY, ID_KEY_ID, "ID_DER_ASN1_DN", "ID_DER_ASN1_GN", "ID_KEY_ID"); -ENUM_NEXT(id_type_names, ID_DER_ASN1_GN_URI, ID_USER_ID, ID_KEY_ID, - "ID_DER_ASN1_GN_URI", - "ID_USER_ID"); -ENUM_END(id_type_names, ID_USER_ID); +ENUM_NEXT(id_type_names, ID_DER_ASN1_GN_URI, ID_DER_ASN1_GN_URI, ID_KEY_ID, + "ID_DER_ASN1_GN_URI"); +ENUM_END(id_type_names, ID_DER_ASN1_GN_URI); /** * coding of X.501 distinguished name @@ -859,7 +858,6 @@ int identification_printf_hook(printf_hook_data_t *data, case ID_FQDN: case ID_RFC822_ADDR: case ID_DER_ASN1_GN_URI: - case ID_USER_ID: chunk_printable(this->encoded, &proper, '?'); snprintf(buf, sizeof(buf), "%.*s", (int)proper.len, proper.ptr); chunk_free(&proper); @@ -941,7 +939,6 @@ static private_identification_t *identification_create(id_type_t type) break; case ID_FQDN: case ID_RFC822_ADDR: - case ID_USER_ID: this->public.hash = _hash_binary; this->public.matches = _matches_string; this->public.equals = _equals_strcasecmp; diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h index a172f64e9..5f27ba112 100644 --- a/src/libstrongswan/utils/identification.h +++ b/src/libstrongswan/utils/identification.h @@ -129,11 +129,6 @@ enum id_type_t { * Private ID type which represents a GeneralName of type URI */ ID_DER_ASN1_GN_URI = 201, - - /** - * Private ID type which represents a user ID - */ - ID_USER_ID = 202 }; /** |