Attachment 644196 Details for Bug 868986 – patch to allow ",," sequence in leftid= to escape a comma

[patch] patch to allow ",," sequence in leftid= to escape a comma

openswan-new-rplus.patch (text/plain), 1.46 KB, created by Matt Rogers on 2012-11-13 16:11:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Rogers

Created: 2012-11-13 16:11:54 UTC

Size: 1.46 KB

patch

obsolete

>--- openswan-2.6.32/lib/libopenswan/x509dn.c.orig       2012-11-06 16:54:34.538794072 -0500
>+++ openswan-2.6.32/lib/libopenswan/x509dn.c    2012-11-13 10:39:07.086725554 -0500
>@@ -730,6 +730,39 @@ dntoa_or_null(char *dst, size_t dstlen, 
>        return dntoa(dst, dstlen, dn);
> }
> 
>+/*
>+ * function for use in atodn() that removes a single comma
>+ * when encountering ",," in the leftid/rightid string. It
>+ * will do this only once for the first ",," found.
>+ */
>+
>+void
>+remove_comma(char *str)
>+{
>+    char comma = ',';
>+    char *src, *dst;
>+    int once = 0;
>+
>+    src = dst = str;
>+    while (*src != '\0' && once == 0)
>+    {
>+        *dst = *src;
>+        src++;
>+        if (*dst++ == comma && *src == comma)
>+        {
>+            src++;
>+            once = 1;
>+        }
>+    }
>+    while (*src != '\0')
>+    {
>+        *dst = *src;
>+        src++;
>+        dst++;
>+    }
>+    *dst = '\0';
>+}
>+
> /*  Converts an LDAP-style human-readable ASCII-encoded
>  *  ASN.1 distinguished name into binary DER-encoded format
>  */
>@@ -828,6 +861,18 @@ atodn(char *src, chunk_t *dn)
>            }
>            else
>            {
>+        if (*src == ',')
>+        {
>+            if (*++src == ',')
>+            {
>+                src--;
>+                name.len++;
>+                remove_comma(src);
>+                break;
>+            } 
>+            else 
>+                src--;
>+        }
>                name.len -= whitespace;
>                code_asn1_length(name.len, &asn1_name_len);
>

Actions: View | Diff

Attachments on bug 868986: 631630 | 644196