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, 129 insertions, 1 deletions

diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c
index 0952e049db..e0e64f0a81 100644
--- a/src/lib/libcrypto/asn1/a_enum.c
+++ b/src/lib/libcrypto/asn1/a_enum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_enum.c,v 1.20 2019/04/28 05:05:56 tb Exp $ */
+/* $OpenBSD: a_enum.c,v 1.21 2021/12/15 18:00:31 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -61,6 +61,7 @@
 
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
+#include <openssl/buffer.h>
 #include <openssl/err.h>
 
 /*
@@ -192,3 +193,130 @@ ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn)
                 BN_set_negative(ret, 1);
         return (ret);
 }
+
+/* Based on a_int.c: equivalent ENUMERATED functions */
+
+int
+i2a_ASN1_ENUMERATED(BIO *bp, const ASN1_ENUMERATED *a)
+{
+        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, "00", 2) != 2)
+                        goto err;
+                n = 2;
+        } 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_ENUMERATED(BIO *bp, ASN1_ENUMERATED *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;
+
+        bs->type = V_ASN1_ENUMERATED;
+
+        bufsize = BIO_gets(bp, buf, size);
+        for (;;) {
+                if (bufsize < 1)
+                        goto err_sl;
+                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;
+                if (first) {
+                        first = 0;
+                        if ((bufp[0] == '0') && (buf[1] == '0')) {
+                                bufp += 2;
+                                i -= 2;
+                        }
+                }
+                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);
+}