diff options
Diffstat (limited to 'src/libstrongswan/asn1/asn1.c')
| -rw-r--r-- | src/libstrongswan/asn1/asn1.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c index f80c2b93b..7f198f9aa 100644 --- a/src/libstrongswan/asn1/asn1.c +++ b/src/libstrongswan/asn1/asn1.c @@ -126,6 +126,8 @@ chunk_t asn1_build_known_oid(int n) /* * Defined in header. */ +<<<<<<< HEAD +======= chunk_t asn1_oid_from_string(char *str) { enumerator_t *enumerator; @@ -220,6 +222,7 @@ char *asn1_oid_to_string(chunk_t oid) /* * Defined in header. */ +>>>>>>> upstream/4.5.1 size_t asn1_length(chunk_t *blob) { u_char n; |