Consolidate various ASN.1 code.

Rather than having multiple files per type (with minimal code per file),
use one file per type (a_<type>.c).

No functional change.

Discussed with tb@

1 files changed, 333 insertions, 0 deletions

diff --git a/src/lib/libcrypto/asn1/a_string.c b/src/lib/libcrypto/asn1/a_string.c
new file mode 100644
index 0000000000..b3a1323a54
--- /dev/null
+++ b/src/lib/libcrypto/asn1/a_string.c
@@ -0,0 +1,333 @@
+/* $OpenBSD: a_string.c,v 1.1 2021/12/15 18:00:31 jsing Exp $ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <openssl/asn1.h>
+#include <openssl/buffer.h>
+#include <openssl/err.h>
+
+int
+ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str)
+{
+        if (str == NULL)
+                return 0;
+        if (!ASN1_STRING_set(dst, str->data, str->length))
+                return 0;
+        dst->type = str->type;
+        dst->flags = str->flags;
+        return 1;
+}
+
+ASN1_STRING *
+ASN1_STRING_dup(const ASN1_STRING *str)
+{
+        ASN1_STRING *ret;
+
+        if (!str)
+                return NULL;
+        ret = ASN1_STRING_new();
+        if (!ret)
+                return NULL;
+        if (!ASN1_STRING_copy(ret, str)) {
+                ASN1_STRING_free(ret);
+                return NULL;
+        }
+        return ret;
+}
+
+int
+ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
+{
+        const char *data = _data;
+
+        if (len < 0) {
+                if (data == NULL)
+                        return (0);
+                else
+                        len = strlen(data);
+        }
+        if ((str->length < len) || (str->data == NULL)) {
+                unsigned char *tmp;
+                tmp = realloc(str->data, len + 1);
+                if (tmp == NULL) {
+                        ASN1error(ERR_R_MALLOC_FAILURE);
+                        return (0);
+                }
+                str->data = tmp;
+        }
+        str->length = len;
+        if (data != NULL) {
+                memmove(str->data, data, len);
+        }
+        str->data[str->length] = '\0';
+        return (1);
+}
+
+void
+ASN1_STRING_set0(ASN1_STRING *str, void *data, int len)
+{
+        freezero(str->data, str->length);
+        str->data = data;
+        str->length = len;
+}
+
+ASN1_STRING *
+ASN1_STRING_new(void)
+{
+        return (ASN1_STRING_type_new(V_ASN1_OCTET_STRING));
+}
+
+ASN1_STRING *
+ASN1_STRING_type_new(int type)
+{
+        ASN1_STRING *a;
+
+        if ((a = calloc(1, sizeof(ASN1_STRING))) == NULL) {
+                ASN1error(ERR_R_MALLOC_FAILURE);
+                return NULL;
+        }
+        a->type = type;
+
+        return a;
+}
+
+void
+ASN1_STRING_free(ASN1_STRING *a)
+{
+        if (a == NULL)
+                return;
+        if (a->data != NULL && !(a->flags & ASN1_STRING_FLAG_NDEF))
+                freezero(a->data, a->length);
+        free(a);
+}
+
+int
+ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
+{
+        int cmp;
+
+        if (a == NULL || b == NULL)
+                return -1;
+        if ((cmp = (a->length - b->length)) != 0)
+                return cmp;
+        if ((cmp = memcmp(a->data, b->data, a->length)) != 0)
+                return cmp;
+
+        return (a->type - b->type);
+}
+
+void
+asn1_add_error(const unsigned char *address, int offset)
+{
+        ERR_asprintf_error_data("offset=%d", offset);
+}
+
+int
+ASN1_STRING_length(const ASN1_STRING *x)
+{
+        return (x->length);
+}
+
+void
+ASN1_STRING_length_set(ASN1_STRING *x, int len)
+{
+        x->length = len;
+}
+
+int
+ASN1_STRING_type(const ASN1_STRING *x)
+{
+        return (x->type);
+}
+
+unsigned char *
+ASN1_STRING_data(ASN1_STRING *x)
+{
+        return (x->data);
+}
+
+const unsigned char *
+ASN1_STRING_get0_data(const ASN1_STRING *x)
+{
+        return (x->data);
+}
+
+int
+i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type)
+{
+        int i, n = 0;
+        static const char h[] = "0123456789ABCDEF";
+        char buf[2];
+
+        if (a == NULL)
+                return (0);
+
+        if (a->length == 0) {
+                if (BIO_write(bp, "0", 1) != 1)
+                        goto err;
+                n = 1;
+        } else {
+                for (i = 0; i < a->length; i++) {
+                        if ((i != 0) && (i % 35 == 0)) {
+                                if (BIO_write(bp, "\\\n", 2) != 2)
+                                        goto err;
+                                n += 2;
+                        }
+                        buf[0] = h[((unsigned char)a->data[i] >> 4) & 0x0f];
+                        buf[1] = h[((unsigned char)a->data[i]) & 0x0f];
+                        if (BIO_write(bp, buf, 2) != 2)
+                                goto err;
+                        n += 2;
+                }
+        }
+        return (n);
+
+err:
+        return (-1);
+}
+
+int
+a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
+{
+        int ret = 0;
+        int i, j, k, m, n, again, bufsize;
+        unsigned char *s = NULL, *sp;
+        unsigned char *bufp;
+        int first = 1;
+        size_t num = 0, slen = 0;
+
+        bufsize = BIO_gets(bp, buf, size);
+        for (;;) {
+                if (bufsize < 1) {
+                        if (first)
+                                break;
+                        else
+                                goto err_sl;
+                }
+                first = 0;
+
+                i = bufsize;
+                if (buf[i-1] == '\n')
+                        buf[--i] = '\0';
+                if (i == 0)
+                        goto err_sl;
+                if (buf[i-1] == '\r')
+                        buf[--i] = '\0';
+                if (i == 0)
+                        goto err_sl;
+                if (buf[i - 1] == '\\') {
+                        i--;
+                        again = 1;
+                } else
+                        again = 0;
+                buf[i] = '\0';
+                if (i < 2)
+                        goto err_sl;
+
+                bufp = (unsigned char *)buf;
+
+                k = 0;
+                if (i % 2 != 0) {
+                        ASN1error(ASN1_R_ODD_NUMBER_OF_CHARS);
+                        goto err;
+                }
+                i /= 2;
+                if (num + i > slen) {
+                        sp = realloc(s, num + i);
+                        if (sp == NULL) {
+                                ASN1error(ERR_R_MALLOC_FAILURE);
+                                goto err;
+                        }
+                        s = sp;
+                        slen = num + i;
+                }
+                for (j = 0; j < i; j++, k += 2) {
+                        for (n = 0; n < 2; n++) {
+                                m = bufp[k + n];
+                                if ((m >= '0') && (m <= '9'))
+                                        m -= '0';
+                                else if ((m >= 'a') && (m <= 'f'))
+                                        m = m - 'a' + 10;
+                                else if ((m >= 'A') && (m <= 'F'))
+                                        m = m - 'A' + 10;
+                                else {
+                                        ASN1error(ASN1_R_NON_HEX_CHARACTERS);
+                                        goto err;
+                                }
+                                s[num + j] <<= 4;
+                                s[num + j] |= m;
+                        }
+                }
+                num += i;
+                if (again)
+                        bufsize = BIO_gets(bp, buf, size);
+                else
+                        break;
+        }
+        bs->length = num;
+        bs->data = s;
+        return (1);
+
+err_sl:
+        ASN1error(ASN1_R_SHORT_LINE);
+err:
+        free(s);
+        return (ret);
+}