Attachment 631630 Details for Bug 868986 – patch to allow rightid '+' character to ignore comma

[patch] patch to allow rightid '+' character to ignore comma

openswan-rplus.patch (text/plain), 1.58 KB, created by Matt Rogers on 2012-10-22 16:31:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Rogers

Created: 2012-10-22 16:31:38 UTC

Size: 1.58 KB

patch

obsolete

>--- openswan-2.6.32/lib/libopenswan/x509dn.c.orig       2012-10-20 19:36:17.897143490 -0400
>+++ openswan-2.6.32/lib/libopenswan/x509dn.c    2012-10-21 19:36:06.360166407 -0400
>@@ -730,6 +730,17 @@ dntoa_or_null(char *dst, size_t dstlen, 
>        return dntoa(dst, dstlen, dn);
> }
> 
>
>+void remove_plus (char *str) {
>+    char plus = '+';
>+    char *src, *dst;
>+    for (src = dst = str; *src != '\0'; src++) {
>+        *dst = *src;
>+        if (*dst != plus)
>+            dst++;
>+    } 
>+    *dst = '\0';
>+}
>+
> /*  Converts an LDAP-style human-readable ASCII-encoded
>  *  ASN.1 distinguished name into binary DER-encoded format
>  */
>@@ -765,6 +776,7 @@ atodn(char *src, chunk_t *dn)
>     int rdn_set_len = 0;
>     int dn_seq_len  = 0;
>     int pos         = 0;
>+    int skip        = 0;
> 
>     err_t ugh = NULL;
> 
>@@ -818,9 +830,18 @@ atodn(char *src, chunk_t *dn)
>            }
>            break;
>        case READ_NAME:
>-           if (*src != ',' && *src != '/' && *src != '\0')
>+        if (*src == '+')
>+        {   
>+        skip = 1;
>+        *src--;
>+        remove_plus(src);
>+        break;
>+        }
>+
>+           if ((skip == 1) ? *src != '/' && *src != '\0' :
>+                          *src != ',' && *src != '/' && *src != '\0')
>            {
>-               name.len++;
>+           name.len++;
>                if (*src == ' ')
>                    whitespace++;
>                else
>@@ -861,6 +882,7 @@ atodn(char *src, chunk_t *dn)
>                name = empty_chunk;
>                state = SEARCH_OID;
>            }
>+        skip = 0;
>            break;
>        case UNKNOWN_OID:
>            break;
>

Actions: View | Diff

Attachments on bug 868986: 631630 | 644196