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

Use chunk_from_str in identification_from_string

Browse Source 
We always have a non-empty string in those cases as "" is now handled
as ID_ANY.
This commit is contained in:
Tobias Brunner
2013-06-11 11:03:12 +02:00
parent c1be5d66cd
commit 78c37de15a
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/identification.c
+5 -17
View File
@@ -915,7 +915,7 @@ identification_t *identification_create_from_string(char *string)
else else
{ {
this = identification_create(ID_KEY_ID); this = identification_create(ID_KEY_ID);
this->encoded = chunk_clone(chunk_create(string, strlen(string))); this->encoded = chunk_from_str(strdup(string));
} }
return &this->public; return &this->public;
} }
@@ -948,11 +948,7 @@ identification_t *identification_create_from_string(char *string)
else else
{ /* not IPv4, mostly FQDN */ { /* not IPv4, mostly FQDN */
this = identification_create(ID_FQDN); this = identification_create(ID_FQDN);
this->encoded.len = strlen(string); this->encoded = chunk_from_str(strdup(string));
if (this->encoded.len)
{
this->encoded.ptr = strdup(string);
}
} }
return &this->public; return &this->public;
} }
@@ -969,11 +965,7 @@ identification_t *identification_create_from_string(char *string)
else else
{ /* not IPv4/6 fallback to KEY_ID */ { /* not IPv4/6 fallback to KEY_ID */
this = identification_create(ID_KEY_ID); this = identification_create(ID_KEY_ID);
this->encoded.len = strlen(string); this->encoded = chunk_from_str(strdup(string));
if (this->encoded.len)
{
this->encoded.ptr = strdup(string);
}
} }
return &this->public; return &this->public;
} }
@@ -997,7 +989,7 @@ identification_t *identification_create_from_string(char *string)
string += 1; string += 1;
this->encoded.len = strlen(string); this->encoded.len = strlen(string);
if (this->encoded.len) if (this->encoded.len)
{ { /* if we only got an @ */
this->encoded.ptr = strdup(string); this->encoded.ptr = strdup(string);
} }
return &this->public; return &this->public;
@@ -1006,11 +998,7 @@ identification_t *identification_create_from_string(char *string)
else else
{ {
this = identification_create(ID_RFC822_ADDR); this = identification_create(ID_RFC822_ADDR);
this->encoded.len = strlen(string); this->encoded = chunk_from_str(strdup(string));
if (this->encoded.len)
{
this->encoded.ptr = strdup(string);
}
return &this->public; return &this->public;
} }
} }