Revert lots of Cryptlib updates.

OpenSSL changes quite a bit of the key validation, and most of the keys
I can find in the wild aren't marked as trusted by the new checker.

Intel noticed this too: https://github.com/vathpela/edk2/commit/f536d7c3ed
but instead of fixing the compatibility error, they switched their test
data to match the bug.

So that's pretty broken.

For now, I'm reverting OpenSSL 1.1.0e, because we need those certs in
the wild to work.

This reverts commit 513cbe2aea689bf968f171f894f3d4cdb43524d5.
This reverts commit e9cc33d6f2b7f35c6f5e349fd83fb9ae0bc66226.
This reverts commit 80d49f758ead0180bfe6161931838e0578248303.
This reverts commit 9bc647e2b23bcfd69a0077c0717fbc454c919a57.
This reverts commit ae75df6232ad30f3e8736e9449692d58a7439260.
This reverts commit e883479f35644d17db7efed710657c8543cfcb68.
This reverts commit 97469449fda5ba933a64280917e776487301a127.
This reverts commit e39692647f78e13d757ddbfdd36f440d5f526050.
This reverts commit 0f3dfc01e2d5e7df882c963dd8dc4a0dfbfc96ad.
This reverts commit 4da6ac819510c7cc4ba21d7a735d69b45daa5873.
This reverts commit d064bd7eef201f26cb926450a76260b5187ac689.
This reverts commit 9bc86cfd6f9387f0da9d5c0102b6aa5627e91c91.
This reverts commit ab9a05a10f16b33f7ee1e9da360c7801eebdb9d2.

Signed-off-by: Peter Jones <pjones@redhat.com>

1 files changed, 258 insertions, 418 deletions

diff --git a/Cryptlib/OpenSSL/crypto/asn1/a_int.c b/Cryptlib/OpenSSL/crypto/asn1/a_int.c
index e0bcd6e5..7e26704a 100644
--- a/Cryptlib/OpenSSL/crypto/asn1/a_int.c
+++ b/Cryptlib/OpenSSL/crypto/asn1/a_int.c
@@ -1,23 +1,69 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+/* crypto/asn1/a_int.c */
+/* 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.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
+ * 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 "internal/cryptlib.h"
-#include "internal/numbers.h"
-#include <limits.h>
+#include "cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
-#include "asn1_locl.h"
 
 ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
-    return ASN1_STRING_dup(x);
+    return M_ASN1_INTEGER_dup(x);
 }
 
 int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
@@ -41,11 +87,10 @@ int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
 }
 
 /*-
- * This converts a big endian buffer and sign into its content encoding.
- * This is used for INTEGER and ENUMERATED types.
+ * This converts an ASN1 INTEGER into its content encoding.
  * The internal representation is an ASN1_STRING whose data is a big endian
  * representation of the value, ignoring the sign. The sign is determined by
- * the type: if type & V_ASN1_NEG is true it is negative, otherwise positive.
+ * the type: V_ASN1_INTEGER for positive and V_ASN1_NEG_INTEGER for negative.
  *
  * Positive integers are no problem: they are almost the same as the DER
  * encoding, except if the first byte is >= 0x80 we need to add a zero pad.
@@ -66,19 +111,19 @@ int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
  * followed by optional zeros isn't padded.
  */
 
-static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
-                       unsigned char **pp)
+int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
 {
-    int pad = 0;
-    size_t ret, i;
-    unsigned char *p, pb = 0;
-    const unsigned char *n;
+    int pad = 0, ret, i, neg;
+    unsigned char *p, *n, pb = 0;
 
-    if (b == NULL || blen == 0)
+    if (a == NULL)
+        return (0);
+    neg = a->type & V_ASN1_NEG;
+    if (a->length == 0)
         ret = 1;
     else {
-        ret = blen;
-        i = b[0];
+        ret = a->length;
+        i = a->data[0];
         if (ret == 1 && i == 0)
             neg = 0;
         if (!neg && (i > 127)) {
@@ -93,8 +138,8 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
                  * Special case: if any other bytes non zero we pad:
                  * otherwise we don't.
                  */
-                for (i = 1; i < blen; i++)
-                    if (b[i]) {
+                for (i = 1; i < a->length; i++)
+                    if (a->data[i]) {
                         pad = 1;
                         pb = 0xFF;
                         break;
@@ -104,299 +149,127 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
         ret += pad;
     }
     if (pp == NULL)
-        return ret;
+        return (ret);
     p = *pp;
 
     if (pad)
         *(p++) = pb;
-    if (b == NULL || blen == 0)
-        *p = 0;
+    if (a->length == 0)
+        *(p++) = 0;
     else if (!neg)
-        memcpy(p, b, blen);
+        memcpy(p, a->data, (unsigned int)a->length);
     else {
         /* Begin at the end of the encoding */
-        n = b + blen;
-        p += blen;
-        i = blen;
+        n = a->data + a->length - 1;
+        p += a->length - 1;
+        i = a->length;
         /* Copy zeros to destination as long as source is zero */
-        while (!n[-1] && i > 1) {
-            *(--p) = 0;
+        while (!*n && i > 1) {
+            *(p--) = 0;
             n--;
             i--;
         }
         /* Complement and increment next octet */
-        *(--p) = ((*(--n)) ^ 0xff) + 1;
+        *(p--) = ((*(n--)) ^ 0xff) + 1;
         i--;
         /* Complement any octets left */
         for (; i > 0; i--)
-            *(--p) = *(--n) ^ 0xff;
+            *(p--) = *(n--) ^ 0xff;
     }
 
     *pp += ret;
-    return ret;
-}
-
-/*
- * convert content octets into a big endian buffer. Returns the length
- * of buffer or 0 on error: for malformed INTEGER. If output buffer is
- * NULL just return length.
- */
-
-static size_t c2i_ibuf(unsigned char *b, int *pneg,
-                       const unsigned char *p, size_t plen)
-{
-    size_t i;
-    int neg, pad;
-    /* Zero content length is illegal */
-    if (plen == 0) {
-        ASN1err(ASN1_F_C2I_IBUF, ASN1_R_ILLEGAL_ZERO_CONTENT);
-        return 0;
-    }
-    neg = p[0] & 0x80;
-    if (pneg)
-        *pneg = neg;
-    /* Handle common case where length is 1 octet separately */
-    if (plen == 1) {
-        if (b) {
-            if (neg)
-                b[0] = (p[0] ^ 0xFF) + 1;
-            else
-                b[0] = p[0];
-        }
-        return 1;
-    }
-    if (p[0] == 0 || p[0] == 0xFF)
-        pad = 1;
-    else
-        pad = 0;
-    /* reject illegal padding: first two octets MSB can't match */
-    if (pad && (neg == (p[1] & 0x80))) {
-        ASN1err(ASN1_F_C2I_IBUF, ASN1_R_ILLEGAL_PADDING);
-        return 0;
-    }
-    /* If positive just copy across */
-    if (neg == 0) {
-        if (b)
-            memcpy(b, p + pad, plen - pad);
-        return plen - pad;
-    }
-
-    if (neg && pad) {
-        /* check is any following octets are non zero */
-        for (i = 1; i < plen; i++) {
-            if (p[i] != 0)
-                break;
-        }
-        /* if all bytes are zero handle as special case */
-        if (i == plen) {
-            if (b) {
-                b[0] = 1;
-                memset(b + 1, 0, plen - 1);
-            }
-            return plen;
-        }
-    }
-
-    plen -= pad;
-    /* Must be negative: calculate twos complement */
-    if (b) {
-        const unsigned char *from = p + plen - 1 + pad;
-        unsigned char *to = b + plen;
-        i = plen;
-        while (*from == 0 && i) {
-            *--to = 0;
-            i--;
-            from--;
-        }
-        *--to = (*from-- ^ 0xff) + 1;
-        OPENSSL_assert(i != 0);
-        i--;
-        for (; i > 0; i--)
-            *--to = *from-- ^ 0xff;
-    }
-    return plen;
-}
-
-int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
-{
-    return i2c_ibuf(a->data, a->length, a->type & V_ASN1_NEG, pp);
-}
-
-/* Convert big endian buffer into uint64_t, return 0 on error */
-static int asn1_get_uint64(uint64_t *pr, const unsigned char *b, size_t blen)
-{
-    size_t i;
-    if (blen > sizeof(*pr)) {
-        ASN1err(ASN1_F_ASN1_GET_UINT64, ASN1_R_TOO_LARGE);
-        return 0;
-    }
-    *pr = 0;
-    if (b == NULL)
-        return 0;
-    for (i = 0; i < blen; i++) {
-        *pr <<= 8;
-        *pr |= b[i];
-    }
-    return 1;
+    return (ret);
 }
 
-static size_t asn1_put_uint64(unsigned char *b, uint64_t r)
-{
-    if (r >= 0x100) {
-        unsigned char *p;
-        uint64_t rtmp = r;
-        size_t i = 0;
-
-        /* Work out how many bytes we need */
-        while (rtmp) {
-            rtmp >>= 8;
-            i++;
-        }
-
-        /* Copy from end to beginning */
-        p = b + i - 1;
-
-        do {
-            *p-- = r & 0xFF;
-            r >>= 8;
-        } while (p >= b);
+/* Convert just ASN1 INTEGER content octets to ASN1_INTEGER structure */
 
-        return i;
-    }
-
-    b[0] = (unsigned char)r;
-    return 1;
-
-}
-
-/*
- * Absolute value of INT64_MIN: we can't just use -INT64_MIN as it produces
- * overflow warnings.
- */
-
-#define ABS_INT64_MIN \
-    ((uint64_t)INT64_MAX + (uint64_t)(-(INT64_MIN + INT64_MAX)))
-
-/* signed version of asn1_get_uint64 */
-static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen,
-                          int neg)
-{
-    uint64_t r;
-    if (asn1_get_uint64(&r, b, blen) == 0)
-        return 0;
-    if (neg) {
-        if (r > ABS_INT64_MIN) {
-            ASN1err(ASN1_F_ASN1_GET_INT64, ASN1_R_TOO_SMALL);
-            return 0;
-        }
-        *pr = 0 - (uint64_t)r;
-    } else {
-        if (r > INT64_MAX) {
-            ASN1err(ASN1_F_ASN1_GET_INT64, ASN1_R_TOO_LARGE);
-            return 0;
-        }
-        *pr = (int64_t)r;
-    }
-    return 1;
-}
-
-/* Convert ASN1 INTEGER content octets to ASN1_INTEGER structure */
 ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
                                long len)
 {
     ASN1_INTEGER *ret = NULL;
-    size_t r;
-    int neg;
-
-    r = c2i_ibuf(NULL, NULL, *pp, len);
-
-    if (r == 0)
-        return NULL;
+    const unsigned char *p, *pend;
+    unsigned char *to, *s;
+    int i;
 
     if ((a == NULL) || ((*a) == NULL)) {
-        ret = ASN1_INTEGER_new();
-        if (ret == NULL)
-            return NULL;
+        if ((ret = M_ASN1_INTEGER_new()) == NULL)
+            return (NULL);
         ret->type = V_ASN1_INTEGER;
     } else
-        ret = *a;
-
-    if (ASN1_STRING_set(ret, NULL, r) == 0)
-        goto err;
-
-    c2i_ibuf(ret->data, &neg, *pp, len);
-
-    if (neg)
-        ret->type |= V_ASN1_NEG;
+        ret = (*a);
 
-    *pp += len;
-    if (a != NULL)
-        (*a) = ret;
-    return ret;
- err:
-    ASN1err(ASN1_F_C2I_ASN1_INTEGER, ERR_R_MALLOC_FAILURE);
-    if ((a == NULL) || (*a != ret))
-        ASN1_INTEGER_free(ret);
-    return NULL;
-}
+    p = *pp;
+    pend = p + len;
 
-static int asn1_string_get_int64(int64_t *pr, const ASN1_STRING *a, int itype)
-{
-    if (a == NULL) {
-        ASN1err(ASN1_F_ASN1_STRING_GET_INT64, ERR_R_PASSED_NULL_PARAMETER);
-        return 0;
-    }
-    if ((a->type & ~V_ASN1_NEG) != itype) {
-        ASN1err(ASN1_F_ASN1_STRING_GET_INT64, ASN1_R_WRONG_INTEGER_TYPE);
-        return 0;
+    /*
+     * We must OPENSSL_malloc stuff, even for 0 bytes otherwise it signifies
+     * a missing NULL parameter.
+     */
+    s = (unsigned char *)OPENSSL_malloc((int)len + 1);
+    if (s == NULL) {
+        i = ERR_R_MALLOC_FAILURE;
+        goto err;
     }
-    return asn1_get_int64(pr, a->data, a->length, a->type & V_ASN1_NEG);
-}
-
-static int asn1_string_set_int64(ASN1_STRING *a, int64_t r, int itype)
-{
-    unsigned char tbuf[sizeof(r)];
-    size_t l;
-    a->type = itype;
-    if (r < 0) {
-        l = asn1_put_uint64(tbuf, -r);
-        a->type |= V_ASN1_NEG;
+    to = s;
+    if (!len) {
+        /*
+         * Strictly speaking this is an illegal INTEGER but we tolerate it.
+         */
+        ret->type = V_ASN1_INTEGER;
+    } else if (*p & 0x80) {     /* a negative number */
+        ret->type = V_ASN1_NEG_INTEGER;
+        if ((*p == 0xff) && (len != 1)) {
+            p++;
+            len--;
+        }
+        i = len;
+        p += i - 1;
+        to += i - 1;
+        while ((!*p) && i) {
+            *(to--) = 0;
+            i--;
+            p--;
+        }
+        /*
+         * Special case: if all zeros then the number will be of the form FF
+         * followed by n zero bytes: this corresponds to 1 followed by n zero
+         * bytes. We've already written n zeros so we just append an extra
+         * one and set the first byte to a 1. This is treated separately
+         * because it is the only case where the number of bytes is larger
+         * than len.
+         */
+        if (!i) {
+            *s = 1;
+            s[len] = 0;
+            len++;
+        } else {
+            *(to--) = (*(p--) ^ 0xff) + 1;
+            i--;
+            for (; i > 0; i--)
+                *(to--) = *(p--) ^ 0xff;
+        }
     } else {
-        l = asn1_put_uint64(tbuf, r);
-        a->type &= ~V_ASN1_NEG;
-    }
-    if (l == 0)
-        return 0;
-    return ASN1_STRING_set(a, tbuf, l);
-}
-
-static int asn1_string_get_uint64(uint64_t *pr, const ASN1_STRING *a,
-                                  int itype)
-{
-    if (a == NULL) {
-        ASN1err(ASN1_F_ASN1_STRING_GET_UINT64, ERR_R_PASSED_NULL_PARAMETER);
-        return 0;
-    }
-    if ((a->type & ~V_ASN1_NEG) != itype) {
-        ASN1err(ASN1_F_ASN1_STRING_GET_UINT64, ASN1_R_WRONG_INTEGER_TYPE);
-        return 0;
-    }
-    if (a->type & V_ASN1_NEG) {
-        ASN1err(ASN1_F_ASN1_STRING_GET_UINT64, ASN1_R_ILLEGAL_NEGATIVE_VALUE);
-        return 0;
+        ret->type = V_ASN1_INTEGER;
+        if ((*p == 0) && (len != 1)) {
+            p++;
+            len--;
+        }
+        memcpy(s, p, (int)len);
     }
-    return asn1_get_uint64(pr, a->data, a->length);
-}
 
-static int asn1_string_set_uint64(ASN1_STRING *a, uint64_t r, int itype)
-{
-    unsigned char tbuf[sizeof(r)];
-    size_t l;
-    a->type = itype;
-    l = asn1_put_uint64(tbuf, r);
-    if (l == 0)
-        return 0;
-    return ASN1_STRING_set(a, tbuf, l);
+    if (ret->data != NULL)
+        OPENSSL_free(ret->data);
+    ret->data = s;
+    ret->length = (int)len;
+    if (a != NULL)
+        (*a) = ret;
+    *pp = pend;
+    return (ret);
+ err:
+    ASN1err(ASN1_F_C2I_ASN1_INTEGER, i);
+    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+        M_ASN1_INTEGER_free(ret);
+    return (NULL);
 }
 
 /*
@@ -416,7 +289,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     int i;
 
     if ((a == NULL) || ((*a) == NULL)) {
-        if ((ret = ASN1_INTEGER_new()) == NULL)
+        if ((ret = M_ASN1_INTEGER_new()) == NULL)
             return (NULL);
         ret->type = V_ASN1_INTEGER;
     } else
@@ -438,7 +311,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
      * We must OPENSSL_malloc stuff, even for 0 bytes otherwise it signifies
      * a missing NULL parameter.
      */
-    s = OPENSSL_malloc((int)len + 1);
+    s = (unsigned char *)OPENSSL_malloc((int)len + 1);
     if (s == NULL) {
         i = ERR_R_MALLOC_FAILURE;
         goto err;
@@ -453,7 +326,8 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
         p += len;
     }
 
-    OPENSSL_free(ret->data);
+    if (ret->data != NULL)
+        OPENSSL_free(ret->data);
     ret->data = s;
     ret->length = (int)len;
     if (a != NULL)
@@ -462,163 +336,129 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     return (ret);
  err:
     ASN1err(ASN1_F_D2I_ASN1_UINTEGER, i);
-    if ((a == NULL) || (*a != ret))
-        ASN1_INTEGER_free(ret);
+    if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+        M_ASN1_INTEGER_free(ret);
     return (NULL);
 }
 
-static ASN1_STRING *bn_to_asn1_string(const BIGNUM *bn, ASN1_STRING *ai,
-                                      int atype)
+int ASN1_INTEGER_set(ASN1_INTEGER *a, long v)
 {
-    ASN1_INTEGER *ret;
-    int len;
-
-    if (ai == NULL) {
-        ret = ASN1_STRING_type_new(atype);
-    } else {
-        ret = ai;
-        ret->type = atype;
+    int j, k;
+    unsigned int i;
+    unsigned char buf[sizeof(long) + 1];
+    long d;
+
+    a->type = V_ASN1_INTEGER;
+    if (a->length < (int)(sizeof(long) + 1)) {
+        if (a->data != NULL)
+            OPENSSL_free(a->data);
+        if ((a->data =
+             (unsigned char *)OPENSSL_malloc(sizeof(long) + 1)) != NULL)
+            memset((char *)a->data, 0, sizeof(long) + 1);
     }
-
-    if (ret == NULL) {
-        ASN1err(ASN1_F_BN_TO_ASN1_STRING, ERR_R_NESTED_ASN1_ERROR);
-        goto err;
+    if (a->data == NULL) {
+        ASN1err(ASN1_F_ASN1_INTEGER_SET, ERR_R_MALLOC_FAILURE);
+        return (0);
     }
-
-    if (BN_is_negative(bn) && !BN_is_zero(bn))
-        ret->type |= V_ASN1_NEG_INTEGER;
-
-    len = BN_num_bytes(bn);
-
-    if (len == 0)
-        len = 1;
-
-    if (ASN1_STRING_set(ret, NULL, len) == 0) {
-        ASN1err(ASN1_F_BN_TO_ASN1_STRING, ERR_R_MALLOC_FAILURE);
-        goto err;
-    }
-
-    /* Correct zero case */
-    if (BN_is_zero(bn))
-        ret->data[0] = 0;
-    else
-        len = BN_bn2bin(bn, ret->data);
-    ret->length = len;
-    return ret;
- err:
-    if (ret != ai)
-        ASN1_INTEGER_free(ret);
-    return (NULL);
-}
-
-static BIGNUM *asn1_string_to_bn(const ASN1_INTEGER *ai, BIGNUM *bn,
-                                 int itype)
-{
-    BIGNUM *ret;
-
-    if ((ai->type & ~V_ASN1_NEG) != itype) {
-        ASN1err(ASN1_F_ASN1_STRING_TO_BN, ASN1_R_WRONG_INTEGER_TYPE);
-        return NULL;
+    d = v;
+    if (d < 0) {
+        d = -d;
+        a->type = V_ASN1_NEG_INTEGER;
     }
 
-    ret = BN_bin2bn(ai->data, ai->length, bn);
-    if (ret == 0) {
-        ASN1err(ASN1_F_ASN1_STRING_TO_BN, ASN1_R_BN_LIB);
-        return NULL;
+    for (i = 0; i < sizeof(long); i++) {
+        if (d == 0)
+            break;
+        buf[i] = (int)d & 0xff;
+        d >>= 8;
     }
-    if (ai->type & V_ASN1_NEG)
-        BN_set_negative(ret, 1);
-    return ret;
-}
-
-int ASN1_INTEGER_get_int64(int64_t *pr, const ASN1_INTEGER *a)
-{
-    return asn1_string_get_int64(pr, a, V_ASN1_INTEGER);
-}
-
-int ASN1_INTEGER_set_int64(ASN1_INTEGER *a, int64_t r)
-{
-    return asn1_string_set_int64(a, r, V_ASN1_INTEGER);
-}
-
-int ASN1_INTEGER_get_uint64(uint64_t *pr, const ASN1_INTEGER *a)
-{
-    return asn1_string_get_uint64(pr, a, V_ASN1_INTEGER);
-}
-
-int ASN1_INTEGER_set_uint64(ASN1_INTEGER *a, uint64_t r)
-{
-    return asn1_string_set_uint64(a, r, V_ASN1_INTEGER);
-}
-
-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v)
-{
-    return ASN1_INTEGER_set_int64(a, v);
+    j = 0;
+    for (k = i - 1; k >= 0; k--)
+        a->data[j++] = buf[k];
+    a->length = j;
+    return (1);
 }
 
 long ASN1_INTEGER_get(const ASN1_INTEGER *a)
 {
-    int i;
-    int64_t r;
+    int neg = 0, i;
+    long r = 0;
+
     if (a == NULL)
-        return 0;
-    i = ASN1_INTEGER_get_int64(&r, a);
-    if (i == 0)
+        return (0L);
+    i = a->type;
+    if (i == V_ASN1_NEG_INTEGER)
+        neg = 1;
+    else if (i != V_ASN1_INTEGER)
         return -1;
-    if (r > LONG_MAX || r < LONG_MIN)
-        return -1;
-    return (long)r;
-}
 
-ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai)
-{
-    return bn_to_asn1_string(bn, ai, V_ASN1_INTEGER);
-}
+    if (a->length > (int)sizeof(long)) {
+        /* hmm... a bit ugly, return all ones */
+        return -1;
+    }
+    if (a->data == NULL)
+        return 0;
 
-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn)
-{
-    return asn1_string_to_bn(ai, bn, V_ASN1_INTEGER);
+    for (i = 0; i < a->length; i++) {
+        r <<= 8;
+        r |= (unsigned char)a->data[i];
+    }
+    if (neg)
+        r = -r;
+    return (r);
 }
 
-int ASN1_ENUMERATED_get_int64(int64_t *pr, const ASN1_ENUMERATED *a)
+ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai)
 {
-    return asn1_string_get_int64(pr, a, V_ASN1_ENUMERATED);
-}
+    ASN1_INTEGER *ret;
+    int len, j;
 
-int ASN1_ENUMERATED_set_int64(ASN1_ENUMERATED *a, int64_t r)
-{
-    return asn1_string_set_int64(a, r, V_ASN1_ENUMERATED);
+    if (ai == NULL)
+        ret = M_ASN1_INTEGER_new();
+    else
+        ret = ai;
+    if (ret == NULL) {
+        ASN1err(ASN1_F_BN_TO_ASN1_INTEGER, ERR_R_NESTED_ASN1_ERROR);
+        goto err;
+    }
+    if (BN_is_negative(bn) && !BN_is_zero(bn))
+        ret->type = V_ASN1_NEG_INTEGER;
+    else
+        ret->type = V_ASN1_INTEGER;
+    j = BN_num_bits(bn);
+    len = ((j == 0) ? 0 : ((j / 8) + 1));
+    if (ret->length < len + 4) {
+        unsigned char *new_data = OPENSSL_realloc(ret->data, len + 4);
+        if (!new_data) {
+            ASN1err(ASN1_F_BN_TO_ASN1_INTEGER, ERR_R_MALLOC_FAILURE);
+            goto err;
+        }
+        ret->data = new_data;
+    }
+    ret->length = BN_bn2bin(bn, ret->data);
+    /* Correct zero case */
+    if (!ret->length) {
+        ret->data[0] = 0;
+        ret->length = 1;
+    }
+    return (ret);
+ err:
+    if (ret != ai)
+        M_ASN1_INTEGER_free(ret);
+    return (NULL);
 }
 
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
+BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn)
 {
-    return ASN1_ENUMERATED_set_int64(a, v);
-}
+    BIGNUM *ret;
 
-long ASN1_ENUMERATED_get(const ASN1_ENUMERATED *a)
-{
-    int i;
-    int64_t r;
-    if (a == NULL)
-        return 0;
-    if ((a->type & ~V_ASN1_NEG) != V_ASN1_ENUMERATED)
-        return -1;
-    if (a->length > (int)sizeof(long))
-        return 0xffffffffL;
-    i = ASN1_ENUMERATED_get_int64(&r, a);
-    if (i == 0)
-        return -1;
-    if (r > LONG_MAX || r < LONG_MIN)
-        return -1;
-    return (long)r;
+    if ((ret = BN_bin2bn(ai->data, ai->length, bn)) == NULL)
+        ASN1err(ASN1_F_ASN1_INTEGER_TO_BN, ASN1_R_BN_LIB);
+    else if (ai->type == V_ASN1_NEG_INTEGER)
+        BN_set_negative(ret, 1);
+    return (ret);
 }
 
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(const BIGNUM *bn, ASN1_ENUMERATED *ai)
-{
-    return bn_to_asn1_string(bn, ai, V_ASN1_ENUMERATED);
-}
+IMPLEMENT_STACK_OF(ASN1_INTEGER)
 
-BIGNUM *ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn)
-{
-    return asn1_string_to_bn(ai, bn, V_ASN1_ENUMERATED);
-}
+IMPLEMENT_ASN1_SET_OF(ASN1_INTEGER)