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

identification: parse identities having a "@@" prefix as ID_RFC822_ADDR

Browse Source 
Original patch by Gerald Richter.
This commit is contained in:
Martin Willi
2013-07-18 16:45:10 +02:00
parent c3b8335cfb
commit cb6c4e0430
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/identification.c
+10 -11
View File
@@ -1000,23 +1000,23 @@ identification_t *identification_create_from_string(char *string)
{ {
if (*string == '@') if (*string == '@')
{ {
if (*(string + 1) == '#') string++;
if (*string == '#')
{ {
this = identification_create(ID_KEY_ID); this = identification_create(ID_KEY_ID);
string += 2; this->encoded = chunk_from_hex(chunk_from_str(string + 1), NULL);
this->encoded = chunk_from_hex( return &this->public;
chunk_create(string, strlen(string)), NULL); }
else if (*string == '@')
{
this = identification_create(ID_USER_FQDN);
this->encoded = chunk_clone(chunk_from_str(string + 1));
return &this->public; return &this->public;
} }
else else
{ {
this = identification_create(ID_FQDN); this = identification_create(ID_FQDN);
string += 1; this->encoded = chunk_clone(chunk_from_str(string));
this->encoded.len = strlen(string);
if (this->encoded.len)
{ /* if we only got an @ */
this->encoded.ptr = strdup(string);
}
return &this->public; return &this->public;
} }
} }
@@ -1093,4 +1093,3 @@ identification_t *identification_create_from_sockaddr(sockaddr_t *sockaddr)
} }
} }
} }