grpc 1.21.0 → 1.32.0

data/third_party/boringssl/crypto/err/internal.h

@@ -1,58 +0,0 @@
-/* Copyright (c) 2017, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-
-#ifndef OPENSSL_HEADER_CRYPTO_ERR_INTERNAL_H
-#define OPENSSL_HEADER_CRYPTO_ERR_INTERNAL_H
-
-#include <openssl/err.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-
-// Private error queue functions.
-
-// ERR_SAVE_STATE contains a saved representation of the error queue. It is
-// slightly more compact than |ERR_STATE| as the error queue will typically not
-// contain |ERR_NUM_ERRORS| entries.
-typedef struct err_save_state_st ERR_SAVE_STATE;
-
-// ERR_SAVE_STATE_free releases all memory associated with |state|.
-OPENSSL_EXPORT void ERR_SAVE_STATE_free(ERR_SAVE_STATE *state);
-
-// ERR_save_state returns a newly-allocated |ERR_SAVE_STATE| structure
-// containing the current state of the error queue or NULL on allocation
-// error. It should be released with |ERR_SAVE_STATE_free|.
-OPENSSL_EXPORT ERR_SAVE_STATE *ERR_save_state(void);
-
-// ERR_restore_state clears the error queue and replaces it with |state|.
-OPENSSL_EXPORT void ERR_restore_state(const ERR_SAVE_STATE *state);
-
-
-#if defined(__cplusplus)
-}  // extern C
-
-extern "C++" {
-
-namespace bssl {
-
-BORINGSSL_MAKE_DELETER(ERR_SAVE_STATE, ERR_SAVE_STATE_free)
-
-}  // namespace bssl
-
-}  // extern C++
-#endif
-
-#endif  // OPENSSL_HEADER_CRYPTO_ERR_INTERNAL_H

data/third_party/boringssl/crypto/evp/evp.c

@@ -1,362 +0,0 @@
-/* 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 <openssl/evp.h>
-
-#include <assert.h>
-#include <string.h>
-
-#include <openssl/dsa.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-#include <openssl/nid.h>
-#include <openssl/rsa.h>
-#include <openssl/thread.h>
-
-#include "internal.h"
-#include "../internal.h"
-
-
-EVP_PKEY *EVP_PKEY_new(void) {
-  EVP_PKEY *ret;
-
-  ret = OPENSSL_malloc(sizeof(EVP_PKEY));
-  if (ret == NULL) {
-    OPENSSL_PUT_ERROR(EVP, ERR_R_MALLOC_FAILURE);
-    return NULL;
-  }
-
-  OPENSSL_memset(ret, 0, sizeof(EVP_PKEY));
-  ret->type = EVP_PKEY_NONE;
-  ret->references = 1;
-
-  return ret;
-}
-
-static void free_it(EVP_PKEY *pkey) {
-  if (pkey->ameth && pkey->ameth->pkey_free) {
-    pkey->ameth->pkey_free(pkey);
-    pkey->pkey.ptr = NULL;
-    pkey->type = EVP_PKEY_NONE;
-  }
-}
-
-void EVP_PKEY_free(EVP_PKEY *pkey) {
-  if (pkey == NULL) {
-    return;
-  }
-
-  if (!CRYPTO_refcount_dec_and_test_zero(&pkey->references)) {
-    return;
-  }
-
-  free_it(pkey);
-  OPENSSL_free(pkey);
-}
-
-int EVP_PKEY_up_ref(EVP_PKEY *pkey) {
-  CRYPTO_refcount_inc(&pkey->references);
-  return 1;
-}
-
-int EVP_PKEY_is_opaque(const EVP_PKEY *pkey) {
-  if (pkey->ameth && pkey->ameth->pkey_opaque) {
-    return pkey->ameth->pkey_opaque(pkey);
-  }
-  return 0;
-}
-
-int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) {
-  if (a->type != b->type) {
-    return -1;
-  }
-
-  if (a->ameth) {
-    int ret;
-    // Compare parameters if the algorithm has them
-    if (a->ameth->param_cmp) {
-      ret = a->ameth->param_cmp(a, b);
-      if (ret <= 0) {
-        return ret;
-      }
-    }
-
-    if (a->ameth->pub_cmp) {
-      return a->ameth->pub_cmp(a, b);
-    }
-  }
-
-  return -2;
-}
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) {
-  if (to->type != from->type) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_DIFFERENT_KEY_TYPES);
-    goto err;
-  }
-
-  if (EVP_PKEY_missing_parameters(from)) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_MISSING_PARAMETERS);
-    goto err;
-  }
-
-  if (from->ameth && from->ameth->param_copy) {
-    return from->ameth->param_copy(to, from);
-  }
-
-err:
-  return 0;
-}
-
-int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) {
-  if (pkey->ameth && pkey->ameth->param_missing) {
-    return pkey->ameth->param_missing(pkey);
-  }
-  return 0;
-}
-
-int EVP_PKEY_size(const EVP_PKEY *pkey) {
-  if (pkey && pkey->ameth && pkey->ameth->pkey_size) {
-    return pkey->ameth->pkey_size(pkey);
-  }
-  return 0;
-}
-
-int EVP_PKEY_bits(EVP_PKEY *pkey) {
-  if (pkey && pkey->ameth && pkey->ameth->pkey_bits) {
-    return pkey->ameth->pkey_bits(pkey);
-  }
-  return 0;
-}
-
-int EVP_PKEY_id(const EVP_PKEY *pkey) {
-  return pkey->type;
-}
-
-// evp_pkey_asn1_find returns the ASN.1 method table for the given |nid|, which
-// should be one of the |EVP_PKEY_*| values. It returns NULL if |nid| is
-// unknown.
-static const EVP_PKEY_ASN1_METHOD *evp_pkey_asn1_find(int nid) {
-  switch (nid) {
-    case EVP_PKEY_RSA:
-      return &rsa_asn1_meth;
-    case EVP_PKEY_EC:
-      return &ec_asn1_meth;
-    case EVP_PKEY_DSA:
-      return &dsa_asn1_meth;
-    case EVP_PKEY_ED25519:
-      return &ed25519_asn1_meth;
-    default:
-      return NULL;
-  }
-}
-
-int EVP_PKEY_type(int nid) {
-  const EVP_PKEY_ASN1_METHOD *meth = evp_pkey_asn1_find(nid);
-  if (meth == NULL) {
-    return NID_undef;
-  }
-  return meth->pkey_id;
-}
-
-int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) {
-  if (EVP_PKEY_assign_RSA(pkey, key)) {
-    RSA_up_ref(key);
-    return 1;
-  }
-  return 0;
-}
-
-int EVP_PKEY_assign_RSA(EVP_PKEY *pkey, RSA *key) {
-  return EVP_PKEY_assign(pkey, EVP_PKEY_RSA, key);
-}
-
-RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey) {
-  if (pkey->type != EVP_PKEY_RSA) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_AN_RSA_KEY);
-    return NULL;
-  }
-  return pkey->pkey.rsa;
-}
-
-RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey) {
-  RSA *rsa = EVP_PKEY_get0_RSA(pkey);
-  if (rsa != NULL) {
-    RSA_up_ref(rsa);
-  }
-  return rsa;
-}
-
-int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) {
-  if (EVP_PKEY_assign_DSA(pkey, key)) {
-    DSA_up_ref(key);
-    return 1;
-  }
-  return 0;
-}
-
-int EVP_PKEY_assign_DSA(EVP_PKEY *pkey, DSA *key) {
-  return EVP_PKEY_assign(pkey, EVP_PKEY_DSA, key);
-}
-
-DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey) {
-  if (pkey->type != EVP_PKEY_DSA) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_A_DSA_KEY);
-    return NULL;
-  }
-  return pkey->pkey.dsa;
-}
-
-DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey) {
-  DSA *dsa = EVP_PKEY_get0_DSA(pkey);
-  if (dsa != NULL) {
-    DSA_up_ref(dsa);
-  }
-  return dsa;
-}
-
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) {
-  if (EVP_PKEY_assign_EC_KEY(pkey, key)) {
-    EC_KEY_up_ref(key);
-    return 1;
-  }
-  return 0;
-}
-
-int EVP_PKEY_assign_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) {
-  return EVP_PKEY_assign(pkey, EVP_PKEY_EC, key);
-}
-
-EC_KEY *EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) {
-  if (pkey->type != EVP_PKEY_EC) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_AN_EC_KEY_KEY);
-    return NULL;
-  }
-  return pkey->pkey.ec;
-}
-
-EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) {
-  EC_KEY *ec_key = EVP_PKEY_get0_EC_KEY(pkey);
-  if (ec_key != NULL) {
-    EC_KEY_up_ref(ec_key);
-  }
-  return ec_key;
-}
-
-DH *EVP_PKEY_get0_DH(EVP_PKEY *pkey) { return NULL; }
-
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) {
-  if (!EVP_PKEY_set_type(pkey, type)) {
-    return 0;
-  }
-  pkey->pkey.ptr = key;
-  return key != NULL;
-}
-
-int EVP_PKEY_set_type(EVP_PKEY *pkey, int type) {
-  const EVP_PKEY_ASN1_METHOD *ameth;
-
-  if (pkey && pkey->pkey.ptr) {
-    free_it(pkey);
-  }
-
-  ameth = evp_pkey_asn1_find(type);
-  if (ameth == NULL) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_ALGORITHM);
-    ERR_add_error_dataf("algorithm %d", type);
-    return 0;
-  }
-
-  if (pkey) {
-    pkey->ameth = ameth;
-    pkey->type = pkey->ameth->pkey_id;
-  }
-
-  return 1;
-}
-
-
-
-int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) {
-  if (a->type != b->type) {
-    return -1;
-  }
-  if (a->ameth && a->ameth->param_cmp) {
-    return a->ameth->param_cmp(a, b);
-  }
-  return -2;
-}
-
-int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md) {
-  return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD, 0,
-                           (void *)md);
-}
-
-int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **out_md) {
-  return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_GET_MD,
-                           0, (void *)out_md);
-}
-
-void OpenSSL_add_all_algorithms(void) {}
-
-void OPENSSL_add_all_algorithms_conf(void) {}
-
-void OpenSSL_add_all_ciphers(void) {}
-
-void OpenSSL_add_all_digests(void) {}
-
-void EVP_cleanup(void) {}

data/third_party/boringssl/crypto/evp/evp_asn1.c

@@ -1,337 +0,0 @@
-/* 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 <openssl/evp.h>
-
-#include <string.h>
-
-#include <openssl/bytestring.h>
-#include <openssl/dsa.h>
-#include <openssl/ec_key.h>
-#include <openssl/err.h>
-#include <openssl/rsa.h>
-
-#include "internal.h"
-#include "../internal.h"
-
-
-static const EVP_PKEY_ASN1_METHOD *const kASN1Methods[] = {
-    &rsa_asn1_meth,
-    &ec_asn1_meth,
-    &dsa_asn1_meth,
-    &ed25519_asn1_meth,
-};
-
-static int parse_key_type(CBS *cbs, int *out_type) {
-  CBS oid;
-  if (!CBS_get_asn1(cbs, &oid, CBS_ASN1_OBJECT)) {
-    return 0;
-  }
-
-  for (unsigned i = 0; i < OPENSSL_ARRAY_SIZE(kASN1Methods); i++) {
-    const EVP_PKEY_ASN1_METHOD *method = kASN1Methods[i];
-    if (CBS_len(&oid) == method->oid_len &&
-        OPENSSL_memcmp(CBS_data(&oid), method->oid, method->oid_len) == 0) {
-      *out_type = method->pkey_id;
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-EVP_PKEY *EVP_parse_public_key(CBS *cbs) {
-  // Parse the SubjectPublicKeyInfo.
-  CBS spki, algorithm, key;
-  int type;
-  uint8_t padding;
-  if (!CBS_get_asn1(cbs, &spki, CBS_ASN1_SEQUENCE) ||
-      !CBS_get_asn1(&spki, &algorithm, CBS_ASN1_SEQUENCE) ||
-      !parse_key_type(&algorithm, &type) ||
-      !CBS_get_asn1(&spki, &key, CBS_ASN1_BITSTRING) ||
-      CBS_len(&spki) != 0 ||
-      // Every key type defined encodes the key as a byte string with the same
-      // conversion to BIT STRING.
-      !CBS_get_u8(&key, &padding) ||
-      padding != 0) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
-    return NULL;
-  }
-
-  // Set up an |EVP_PKEY| of the appropriate type.
-  EVP_PKEY *ret = EVP_PKEY_new();
-  if (ret == NULL ||
-      !EVP_PKEY_set_type(ret, type)) {
-    goto err;
-  }
-
-  // Call into the type-specific SPKI decoding function.
-  if (ret->ameth->pub_decode == NULL) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_ALGORITHM);
-    goto err;
-  }
-  if (!ret->ameth->pub_decode(ret, &algorithm, &key)) {
-    goto err;
-  }
-
-  return ret;
-
-err:
-  EVP_PKEY_free(ret);
-  return NULL;
-}
-
-int EVP_marshal_public_key(CBB *cbb, const EVP_PKEY *key) {
-  if (key->ameth == NULL || key->ameth->pub_encode == NULL) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_ALGORITHM);
-    return 0;
-  }
-
-  return key->ameth->pub_encode(cbb, key);
-}
-
-EVP_PKEY *EVP_parse_private_key(CBS *cbs) {
-  // Parse the PrivateKeyInfo.
-  CBS pkcs8, algorithm, key;
-  uint64_t version;
-  int type;
-  if (!CBS_get_asn1(cbs, &pkcs8, CBS_ASN1_SEQUENCE) ||
-      !CBS_get_asn1_uint64(&pkcs8, &version) ||
-      version != 0 ||
-      !CBS_get_asn1(&pkcs8, &algorithm, CBS_ASN1_SEQUENCE) ||
-      !parse_key_type(&algorithm, &type) ||
-      !CBS_get_asn1(&pkcs8, &key, CBS_ASN1_OCTETSTRING)) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
-    return NULL;
-  }
-
-  // A PrivateKeyInfo ends with a SET of Attributes which we ignore.
-
-  // Set up an |EVP_PKEY| of the appropriate type.
-  EVP_PKEY *ret = EVP_PKEY_new();
-  if (ret == NULL ||
-      !EVP_PKEY_set_type(ret, type)) {
-    goto err;
-  }
-
-  // Call into the type-specific PrivateKeyInfo decoding function.
-  if (ret->ameth->priv_decode == NULL) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_ALGORITHM);
-    goto err;
-  }
-  if (!ret->ameth->priv_decode(ret, &algorithm, &key)) {
-    goto err;
-  }
-
-  return ret;
-
-err:
-  EVP_PKEY_free(ret);
-  return NULL;
-}
-
-int EVP_marshal_private_key(CBB *cbb, const EVP_PKEY *key) {
-  if (key->ameth == NULL || key->ameth->priv_encode == NULL) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_ALGORITHM);
-    return 0;
-  }
-
-  return key->ameth->priv_encode(cbb, key);
-}
-
-static EVP_PKEY *old_priv_decode(CBS *cbs, int type) {
-  EVP_PKEY *ret = EVP_PKEY_new();
-  if (ret == NULL) {
-    return NULL;
-  }
-
-  switch (type) {
-    case EVP_PKEY_EC: {
-      EC_KEY *ec_key = EC_KEY_parse_private_key(cbs, NULL);
-      if (ec_key == NULL || !EVP_PKEY_assign_EC_KEY(ret, ec_key)) {
-        EC_KEY_free(ec_key);
-        goto err;
-      }
-      return ret;
-    }
-    case EVP_PKEY_DSA: {
-      DSA *dsa = DSA_parse_private_key(cbs);
-      if (dsa == NULL || !EVP_PKEY_assign_DSA(ret, dsa)) {
-        DSA_free(dsa);
-        goto err;
-      }
-      return ret;
-    }
-    case EVP_PKEY_RSA: {
-      RSA *rsa = RSA_parse_private_key(cbs);
-      if (rsa == NULL || !EVP_PKEY_assign_RSA(ret, rsa)) {
-        RSA_free(rsa);
-        goto err;
-      }
-      return ret;
-    }
-    default:
-      OPENSSL_PUT_ERROR(EVP, EVP_R_UNKNOWN_PUBLIC_KEY_TYPE);
-      goto err;
-  }
-
-err:
-  EVP_PKEY_free(ret);
-  return NULL;
-}
-
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **out, const uint8_t **inp,
-                         long len) {
-  if (len < 0) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
-    return NULL;
-  }
-
-  // Parse with the legacy format.
-  CBS cbs;
-  CBS_init(&cbs, *inp, (size_t)len);
-  EVP_PKEY *ret = old_priv_decode(&cbs, type);
-  if (ret == NULL) {
-    // Try again with PKCS#8.
-    ERR_clear_error();
-    CBS_init(&cbs, *inp, (size_t)len);
-    ret = EVP_parse_private_key(&cbs);
-    if (ret == NULL) {
-      return NULL;
-    }
-    if (ret->type != type) {
-      OPENSSL_PUT_ERROR(EVP, EVP_R_DIFFERENT_KEY_TYPES);
-      EVP_PKEY_free(ret);
-      return NULL;
-    }
-  }
-
-  if (out != NULL) {
-    EVP_PKEY_free(*out);
-    *out = ret;
-  }
-  *inp = CBS_data(&cbs);
-  return ret;
-}
-
-// num_elements parses one SEQUENCE from |in| and returns the number of elements
-// in it. On parse error, it returns zero.
-static size_t num_elements(const uint8_t *in, size_t in_len) {
-  CBS cbs, sequence;
-  CBS_init(&cbs, in, (size_t)in_len);
-
-  if (!CBS_get_asn1(&cbs, &sequence, CBS_ASN1_SEQUENCE)) {
-    return 0;
-  }
-
-  size_t count = 0;
-  while (CBS_len(&sequence) > 0) {
-    if (!CBS_get_any_asn1_element(&sequence, NULL, NULL, NULL)) {
-      return 0;
-    }
-
-    count++;
-  }
-
-  return count;
-}
-
-EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **out, const uint8_t **inp, long len) {
-  if (len < 0) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
-    return NULL;
-  }
-
-  // Parse the input as a PKCS#8 PrivateKeyInfo.
-  CBS cbs;
-  CBS_init(&cbs, *inp, (size_t)len);
-  EVP_PKEY *ret = EVP_parse_private_key(&cbs);
-  if (ret != NULL) {
-    if (out != NULL) {
-      EVP_PKEY_free(*out);
-      *out = ret;
-    }
-    *inp = CBS_data(&cbs);
-    return ret;
-  }
-  ERR_clear_error();
-
-  // Count the elements to determine the legacy key format.
-  switch (num_elements(*inp, (size_t)len)) {
-    case 4:
-      return d2i_PrivateKey(EVP_PKEY_EC, out, inp, len);
-
-    case 6:
-      return d2i_PrivateKey(EVP_PKEY_DSA, out, inp, len);
-
-    default:
-      return d2i_PrivateKey(EVP_PKEY_RSA, out, inp, len);
-  }
-}
-
-int i2d_PublicKey(EVP_PKEY *key, uint8_t **outp) {
-  switch (key->type) {
-    case EVP_PKEY_RSA:
-      return i2d_RSAPublicKey(key->pkey.rsa, outp);
-    case EVP_PKEY_DSA:
-      return i2d_DSAPublicKey(key->pkey.dsa, outp);
-    case EVP_PKEY_EC:
-      return i2o_ECPublicKey(key->pkey.ec, outp);
-    default:
-      OPENSSL_PUT_ERROR(EVP, EVP_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
-      return -1;
-  }
-}