denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

identification: Remove unused ID_USER_ID type

Browse Source
This commit is contained in:
Tobias Brunner
2015-08-17 11:49:12 +02:00
parent 4a2e17997f
commit 017dbb1c5e
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/identification.c
+3 -6
View File
@@ -47,10 +47,9 @@ ENUM_BEGIN(id_type_names, ID_ANY, ID_KEY_ID,
"ID_DER_ASN1_DN", "ID_DER_ASN1_DN",
"ID_DER_ASN1_GN", "ID_DER_ASN1_GN",
"ID_KEY_ID"); "ID_KEY_ID");
ENUM_NEXT(id_type_names, ID_DER_ASN1_GN_URI, ID_USER_ID, ID_KEY_ID, ENUM_NEXT(id_type_names, ID_DER_ASN1_GN_URI, ID_DER_ASN1_GN_URI, ID_KEY_ID,
"ID_DER_ASN1_GN_URI", "ID_DER_ASN1_GN_URI");
"ID_USER_ID"); ENUM_END(id_type_names, ID_DER_ASN1_GN_URI);
ENUM_END(id_type_names, ID_USER_ID);
/** /**
* coding of X.501 distinguished name * coding of X.501 distinguished name
@@ -859,7 +858,6 @@ int identification_printf_hook(printf_hook_data_t *data,
case ID_FQDN: case ID_FQDN:
case ID_RFC822_ADDR: case ID_RFC822_ADDR:
case ID_DER_ASN1_GN_URI: case ID_DER_ASN1_GN_URI:
case ID_USER_ID:
chunk_printable(this->encoded, &proper, '?'); chunk_printable(this->encoded, &proper, '?');
snprintf(buf, sizeof(buf), "%.*s", (int)proper.len, proper.ptr); snprintf(buf, sizeof(buf), "%.*s", (int)proper.len, proper.ptr);
chunk_free(&proper); chunk_free(&proper);
@@ -941,7 +939,6 @@ static private_identification_t *identification_create(id_type_t type)
break; break;
case ID_FQDN: case ID_FQDN:
case ID_RFC822_ADDR: case ID_RFC822_ADDR:
case ID_USER_ID:
this->public.hash = _hash_binary; this->public.hash = _hash_binary;
this->public.matches = _matches_string; this->public.matches = _matches_string;
this->public.equals = _equals_strcasecmp; this->public.equals = _equals_strcasecmp;
src/libstrongswan/utils/identification.h
-5
View File
@@ -129,11 +129,6 @@ enum id_type_t {
* Private ID type which represents a GeneralName of type URI * Private ID type which represents a GeneralName of type URI
*/ */
ID_DER_ASN1_GN_URI = 201, ID_DER_ASN1_GN_URI = 201,
/**
* Private ID type which represents a user ID
*/
ID_USER_ID = 202
}; };
/** /**