This commit was manufactured by cvs2git to create tag 'tb_20250414'.tb_20250414

1 files changed, 0 insertions, 373 deletions

diff --git a/src/lib/libcrypto/evp/evp_local.h b/src/lib/libcrypto/evp/evp_local.h
deleted file mode 100644
index 54cd65d0af..0000000000
--- a/src/lib/libcrypto/evp/evp_local.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/* $OpenBSD: evp_local.h,v 1.25 2024/08/29 16:58:19 tb Exp $ */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * 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 above 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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_EVP_LOCAL_H
-#define HEADER_EVP_LOCAL_H
-
-__BEGIN_HIDDEN_DECLS
-
-/* XXX - move these to evp.h after unlock. */
-#define EVP_CTRL_GET_IVLEN              0x25
-#define EVP_CIPH_FLAG_CUSTOM_IV_LENGTH  0x400000
-
-#define EVP_CTRL_AEAD_GET_IVLEN         EVP_CTRL_GET_IVLEN
-
-/*
- * Don't free md_ctx->pctx in EVP_MD_CTX_cleanup().  Needed for ownership
- * handling in EVP_MD_CTX_set_pkey_ctx().
- */
-#define EVP_MD_CTX_FLAG_KEEP_PKEY_CTX   0x0400
-
-typedef int evp_sign_method(int type, const unsigned char *m,
-    unsigned int m_length, unsigned char *sigret, unsigned int *siglen,
-    void *key);
-typedef int evp_verify_method(int type, const unsigned char *m,
-    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen,
-    void *key);
-
-struct ecx_key_st {
-        int nid;
-        int key_len;
-        uint8_t *priv_key;
-        size_t priv_key_len;
-        uint8_t *pub_key;
-        size_t pub_key_len;
-};
-
-struct evp_pkey_asn1_method_st {
-        const EVP_PKEY_ASN1_METHOD *base_method;
-        int pkey_id;
-        unsigned long pkey_flags;
-
-        char *pem_str;
-        char *info;
-
-        int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub);
-        int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);
-        int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
-        int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-            ASN1_PCTX *pctx);
-
-        int (*priv_decode)(EVP_PKEY *pk, const PKCS8_PRIV_KEY_INFO *p8inf);
-        int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);
-        int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-            ASN1_PCTX *pctx);
-
-        int (*pkey_size)(const EVP_PKEY *pk);
-        int (*pkey_bits)(const EVP_PKEY *pk);
-        int (*pkey_security_bits)(const EVP_PKEY *pk);
-
-        int (*signature_info)(const X509_ALGOR *sig_alg, int *out_md_nid,
-            int *out_pkey_nid, int *out_security_bits, uint32_t *out_flags);
-
-        int (*param_decode)(EVP_PKEY *pkey, const unsigned char **pder,
-            int derlen);
-        int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder);
-        int (*param_missing)(const EVP_PKEY *pk);
-        int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from);
-        int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
-        int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-            ASN1_PCTX *pctx);
-        int (*sig_print)(BIO *out, const X509_ALGOR *sigalg,
-            const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx);
-
-        void (*pkey_free)(EVP_PKEY *pkey);
-        int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);
-
-        /* Legacy functions for old PEM */
-
-        int (*old_priv_decode)(EVP_PKEY *pkey, const unsigned char **pder,
-            int derlen);
-        int (*old_priv_encode)(const EVP_PKEY *pkey, unsigned char **pder);
-        /* Custom ASN1 signature verification */
-        int (*item_verify)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
-            X509_ALGOR *a, ASN1_BIT_STRING *sig, EVP_PKEY *pkey);
-        int (*item_sign)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
-            X509_ALGOR *alg1, X509_ALGOR *alg2, ASN1_BIT_STRING *sig);
-
-        int (*set_priv_key)(EVP_PKEY *pk, const unsigned char *private_key,
-            size_t len);
-        int (*set_pub_key)(EVP_PKEY *pk, const unsigned char *public_key,
-            size_t len);
-        int (*get_priv_key)(const EVP_PKEY *pk, unsigned char *out_private_key,
-            size_t *out_len);
-        int (*get_pub_key)(const EVP_PKEY *pk, unsigned char *out_public_key,
-            size_t *out_len);
-} /* EVP_PKEY_ASN1_METHOD */;
-
-/* Type needs to be a bit field
- * Sub-type needs to be for variations on the method, as in, can it do
- * arbitrary encryption.... */
-struct evp_pkey_st {
-        int type;
-        int references;
-        const EVP_PKEY_ASN1_METHOD *ameth;
-        union   {
-                void *ptr;
-#ifndef OPENSSL_NO_RSA
-                struct rsa_st *rsa;     /* RSA */
-#endif
-#ifndef OPENSSL_NO_DSA
-                struct dsa_st *dsa;     /* DSA */
-#endif
-#ifndef OPENSSL_NO_DH
-                struct dh_st *dh;       /* DH */
-#endif
-#ifndef OPENSSL_NO_EC
-                struct ec_key_st *ec;   /* ECC */
-                struct ecx_key_st *ecx; /* ECX */
-#endif
-        } pkey;
-        int save_parameters;
-} /* EVP_PKEY */;
-
-struct evp_md_st {
-        int type;
-        int pkey_type;
-        int md_size;
-        unsigned long flags;
-        int (*init)(EVP_MD_CTX *ctx);
-        int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
-        int (*final)(EVP_MD_CTX *ctx, unsigned char *md);
-        int (*copy)(EVP_MD_CTX *to, const EVP_MD_CTX *from);
-        int (*cleanup)(EVP_MD_CTX *ctx);
-
-        int block_size;
-        int ctx_size; /* how big does the ctx->md_data need to be */
-        /* control function */
-        int (*md_ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
-} /* EVP_MD */;
-
-struct evp_md_ctx_st {
-        const EVP_MD *digest;
-        unsigned long flags;
-        void *md_data;
-        /* Public key context for sign/verify */
-        EVP_PKEY_CTX *pctx;
-        /* Update function: usually copied from EVP_MD */
-        int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
-} /* EVP_MD_CTX */;
-
-struct evp_cipher_st {
-        int nid;
-        int block_size;
-        int key_len;            /* Default value for variable length ciphers */
-        int iv_len;
-        unsigned long flags;    /* Various flags */
-        int (*init)(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-            const unsigned char *iv, int enc);  /* init key */
-        int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
-            const unsigned char *in, size_t inl);/* encrypt/decrypt data */
-        int (*cleanup)(EVP_CIPHER_CTX *); /* cleanup ctx */
-        int ctx_size;           /* how big ctx->cipher_data needs to be */
-        int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Populate a ASN1_TYPE with parameters */
-        int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Get parameters from a ASN1_TYPE */
-        int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr); /* Miscellaneous operations */
-} /* EVP_CIPHER */;
-
-struct evp_cipher_ctx_st {
-        const EVP_CIPHER *cipher;
-        int encrypt;            /* encrypt or decrypt */
-        int partial_len;        /* number of bytes written to buf */
-
-        unsigned char oiv[EVP_MAX_IV_LENGTH];   /* original iv */
-        unsigned char iv[EVP_MAX_IV_LENGTH];    /* working iv */
-        unsigned char buf[EVP_MAX_BLOCK_LENGTH];/* saved partial block */
-        int num;                                /* used by cfb/ofb/ctr mode */
-
-        void *app_data;         /* application stuff */
-        int key_len;            /* May change for variable length cipher */
-        unsigned long flags;    /* Various flags */
-        void *cipher_data; /* per EVP data */
-        int final_used;
-        unsigned char final[EVP_MAX_BLOCK_LENGTH];/* possible final block */
-} /* EVP_CIPHER_CTX */;
-
-struct evp_Encode_Ctx_st {
-
-        int num;        /* number saved in a partial encode/decode */
-        int length;     /* The length is either the output line length
-                         * (in input bytes) or the shortest input line
-                         * length that is ok.  Once decoding begins,
-                         * the length is adjusted up each time a longer
-                         * line is decoded */
-        unsigned char enc_data[80];     /* data to encode */
-        int line_num;   /* number read on current line */
-        int expect_nl;
-} /* EVP_ENCODE_CTX */;
-
-#define EVP_MAXCHUNK ((size_t)1<<(sizeof(long)*8-2))
-
-struct evp_pkey_ctx_st {
-        /* Method associated with this operation */
-        const EVP_PKEY_METHOD *pmeth;
-        /* Key: may be NULL */
-        EVP_PKEY *pkey;
-        /* Peer key for key agreement, may be NULL */
-        EVP_PKEY *peerkey;
-        /* Actual operation */
-        int operation;
-        /* Algorithm specific data */
-        void *data;
-        /* Application specific data */
-        void *app_data;
-        /* Keygen callback */
-        EVP_PKEY_gen_cb *pkey_gencb;
-        /* implementation specific keygen data */
-        int *keygen_info;
-        int keygen_info_count;
-} /* EVP_PKEY_CTX */;
-
-struct evp_pkey_method_st {
-        int pkey_id;
-        int flags;
-
-        int (*init)(EVP_PKEY_CTX *ctx);
-        int (*copy)(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src);
-        void (*cleanup)(EVP_PKEY_CTX *ctx);
-
-        int (*paramgen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
-
-        int (*keygen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
-
-        int (*sign_init)(EVP_PKEY_CTX *ctx);
-        int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-            const unsigned char *tbs, size_t tbslen);
-
-        int (*verify_init)(EVP_PKEY_CTX *ctx);
-        int (*verify)(EVP_PKEY_CTX *ctx,
-            const unsigned char *sig, size_t siglen,
-            const unsigned char *tbs, size_t tbslen);
-
-        int (*verify_recover)(EVP_PKEY_CTX *ctx,
-            unsigned char *rout, size_t *routlen,
-            const unsigned char *sig, size_t siglen);
-
-        int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-        int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-            EVP_MD_CTX *mctx);
-
-        int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-            const unsigned char *in, size_t inlen);
-
-        int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-            const unsigned char *in, size_t inlen);
-
-        int (*derive_init)(EVP_PKEY_CTX *ctx);
-        int (*derive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-
-        int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2);
-        int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value);
-
-        int (*digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
-            const unsigned char *tbs, size_t tbslen);
-        int (*digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
-            size_t siglen, const unsigned char *tbs, size_t tbslen);
-} /* EVP_PKEY_METHOD */;
-
-void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
-
-/* EVP_AEAD represents a specific AEAD algorithm. */
-struct evp_aead_st {
-        unsigned char key_len;
-        unsigned char nonce_len;
-        unsigned char overhead;
-        unsigned char max_tag_len;
-
-        int (*init)(struct evp_aead_ctx_st*, const unsigned char *key,
-            size_t key_len, size_t tag_len);
-        void (*cleanup)(struct evp_aead_ctx_st*);
-
-        int (*seal)(const struct evp_aead_ctx_st *ctx, unsigned char *out,
-            size_t *out_len, size_t max_out_len, const unsigned char *nonce,
-            size_t nonce_len, const unsigned char *in, size_t in_len,
-            const unsigned char *ad, size_t ad_len);
-
-        int (*open)(const struct evp_aead_ctx_st *ctx, unsigned char *out,
-            size_t *out_len, size_t max_out_len, const unsigned char *nonce,
-            size_t nonce_len, const unsigned char *in, size_t in_len,
-            const unsigned char *ad, size_t ad_len);
-};
-
-/* An EVP_AEAD_CTX represents an AEAD algorithm configured with a specific key
- * and message-independent IV. */
-struct evp_aead_ctx_st {
-        const EVP_AEAD *aead;
-        /* aead_state is an opaque pointer to the AEAD specific state. */
-        void *aead_state;
-};
-
-/* Legacy EVP_CIPHER methods used by CMS and its predecessors. */
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *cipher, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *cipher, ASN1_TYPE *type);
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *cipher, ASN1_TYPE *type);
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *cipher, ASN1_TYPE *type);
-
-int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-    ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
-
-int EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str);
-int EVP_PKEY_CTX_hex2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *hex);
-int EVP_PKEY_CTX_md(EVP_PKEY_CTX *ctx, int optype, int cmd, const char *md_name);
-
-void EVP_CIPHER_CTX_legacy_clear(EVP_CIPHER_CTX *ctx);
-void EVP_MD_CTX_legacy_clear(EVP_MD_CTX *ctx);
-
-__END_HIDDEN_DECLS
-
-#endif /* !HEADER_EVP_LOCAL_H */