test_mod_mul is useful, let's run it more often.

[openssl.git] / crypto / x509 / x509_obj.c

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index b283a62f5d282e343dd5ce2ffa2983205322f348..6a3ba8eb154322c11965af2ac8af49c4f91d9675 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -75,6 +75,9 @@ int i;
        static char hex[17]="0123456789ABCDEF";
        int gs_doit[4];
        char tmp_buf[80];
        static char hex[17]="0123456789ABCDEF";
        int gs_doit[4];
        char tmp_buf[80];

+#ifdef CHARSET_EBCDIC
+       char ebcdic_buf[1024];
+#endif

 
        if (buf == NULL)
                {
 
        if (buf == NULL)
                {


@@ -88,7 +91,7 @@ int i;
            if(b)
                {
                buf=b->data;
            if(b)
                {
                buf=b->data;

-               Free(b);
+               OPENSSL_free(b);

                }
            strncpy(buf,"NO X509_NAME",len);
            return buf;
                }
            strncpy(buf,"NO X509_NAME",len);
            return buf;


@@ -110,6 +113,19 @@ int i;
                type=ne->value->type;
                num=ne->value->length;
                q=ne->value->data;
                type=ne->value->type;
                num=ne->value->length;
                q=ne->value->data;

+#ifdef CHARSET_EBCDIC
+                if (type == V_ASN1_GENERALSTRING ||
+                   type == V_ASN1_VISIBLESTRING ||
+                   type == V_ASN1_PRINTABLESTRING ||
+                   type == V_ASN1_TELETEXSTRING ||
+                   type == V_ASN1_VISIBLESTRING ||
+                   type == V_ASN1_IA5STRING) {
+                        ascii2ebcdic(ebcdic_buf, q,
+                                    (num > sizeof ebcdic_buf)
+                                    ? sizeof ebcdic_buf : num);
+                        q=ebcdic_buf;
+               }
+#endif

 
                if ((type == V_ASN1_GENERALSTRING) && ((num%4) == 0))
                        {
 
                if ((type == V_ASN1_GENERALSTRING) && ((num%4) == 0))
                        {


@@ -132,7 +148,12 @@ int i;
                        {
                        if (!gs_doit[j&3]) continue;
                        l2++;
                        {
                        if (!gs_doit[j&3]) continue;
                        l2++;

+#ifndef CHARSET_EBCDIC

                        if ((q[j] < ' ') || (q[j] > '~')) l2+=3;
                        if ((q[j] < ' ') || (q[j] > '~')) l2+=3;

+#else
+                       if ((os_toascii[q[j]] < os_toascii[' ']) ||
+                           (os_toascii[q[j]] > os_toascii['~'])) l2+=3;
+#endif

                        }
 
                lold=l;
                        }
 
                lold=l;


@@ -152,11 +173,14 @@ int i;
                memcpy(p,s,(unsigned int)l1); p+=l1;
                *(p++)='=';
 
                memcpy(p,s,(unsigned int)l1); p+=l1;
                *(p++)='=';
 

+#ifndef CHARSET_EBCDIC /* q was assigned above already. */

                q=ne->value->data;
                q=ne->value->data;

+#endif

 
                for (j=0; j<num; j++)
                        {
                        if (!gs_doit[j&3]) continue;
 
                for (j=0; j<num; j++)
                        {
                        if (!gs_doit[j&3]) continue;

+#ifndef CHARSET_EBCDIC

                        n=q[j];
                        if ((n < ' ') || (n > '~'))
                                {
                        n=q[j];
                        if ((n < ' ') || (n > '~'))
                                {


@@ -167,13 +191,26 @@ int i;
                                }
                        else
                                *(p++)=n;
                                }
                        else
                                *(p++)=n;

+#else
+                       n=os_toascii[q[j]];
+                       if ((n < os_toascii[' ']) ||
+                           (n > os_toascii['~']))
+                               {
+                               *(p++)='\\';
+                               *(p++)='x';
+                               *(p++)=hex[(n>>4)&0x0f];
+                               *(p++)=hex[n&0x0f];
+                               }
+                       else
+                               *(p++)=q[j];
+#endif

                        }
                *p='\0';
                }
        if (b != NULL)
                {
                p=b->data;
                        }
                *p='\0';
                }
        if (b != NULL)
                {
                p=b->data;

-               Free(b);
+               OPENSSL_free(b);

                }
        else
                p=buf;
                }
        else
                p=buf;