Cleanup: move providers/common/include/internal/provider_args.h

New name is providers/implementations/include/prov/implementations.h
All inclusions are adapted accordingly.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
master
Richard Levitte 4 years ago
parent 604e884bb8
commit af3e7e1bcc

@ -14,7 +14,7 @@
#include <openssl/core_numbers.h>
#include <openssl/core_names.h>
#include <openssl/params.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* Functions provided by the core */
static OSSL_core_gettable_params_fn *c_gettable_params = NULL;

@ -26,7 +26,7 @@
#include "internal/cryptlib.h"
#include "internal/property.h"
#include "crypto/evp.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/providercommon.h"
#include "selftest.h"

@ -10,7 +10,7 @@
/* Dispatch functions for AES cipher modes ecb, cbc, ofb, cfb, ctr */
#include "cipher_aes.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn aes_freectx;
static OSSL_OP_cipher_dupctx_fn aes_dupctx;

@ -11,7 +11,7 @@
#include "prov/ciphercommon.h"
#include "prov/cipher_ccm.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static void *aes_ccm_newctx(void *provctx, size_t keybits)
{

@ -11,7 +11,7 @@
#include "prov/ciphercommon.h"
#include "prov/cipher_gcm.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static void *aes_gcm_newctx(void *provctx, size_t keybits)
{

@ -10,7 +10,7 @@
#include "cipher_aes_ocb.h"
#include "internal/providercommonerr.h"
#include "prov/cipher_aead.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#define AES_OCB_FLAGS AEAD_FLAGS

@ -9,7 +9,7 @@
#include "cipher_aes.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* AES wrap with padding has IV length of 4, without padding 8 */
#define AES_WRAP_PAD_IVLEN 4

@ -8,7 +8,7 @@
*/
#include "cipher_aes_xts.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
/* TODO (3.0) Figure out what flags need to be set */

@ -10,7 +10,7 @@
/* Dispatch functions for ARIA cipher modes ecb, cbc, ofb, cfb, ctr */
#include "cipher_aria.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn aria_freectx;
static OSSL_OP_cipher_dupctx_fn aria_dupctx;

@ -10,7 +10,7 @@
/* Dispatch functions for ARIA CCM mode */
#include "cipher_aria_ccm.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn aria_ccm_freectx;

@ -10,7 +10,7 @@
/* Dispatch functions for ARIA GCM mode */
#include "cipher_aria_gcm.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static void *aria_gcm_newctx(void *provctx, size_t keybits)
{

@ -10,7 +10,7 @@
/* Dispatch functions for Blowfish cipher modes ecb, cbc, ofb, cfb */
#include "cipher_blowfish.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#define BF_FLAGS (EVP_CIPH_VARIABLE_LENGTH)

@ -10,7 +10,7 @@
/* Dispatch functions for CAMELLIA cipher modes ecb, cbc, ofb, cfb, ctr */
#include "cipher_camellia.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn camellia_freectx;
static OSSL_OP_cipher_dupctx_fn camellia_dupctx;

@ -10,7 +10,7 @@
/* Dispatch functions for cast cipher modes ecb, cbc, ofb, cfb */
#include "cipher_cast.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#define CAST5_FLAGS (EVP_CIPH_VARIABLE_LENGTH)

@ -10,7 +10,7 @@
#include "prov/ciphercommon.h"
#include "cipher_des.h"
#include "crypto/rand.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
/* TODO(3.0) Figure out what flags need to be here */

@ -8,7 +8,7 @@
*/
#include "cipher_tdes_default.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* desx_cbc_functions */
IMPLEMENT_tdes_cipher(desx, DESX, cbc, CBC, TDES_FLAGS, 64*3, 64, 64, block);

@ -10,7 +10,7 @@
/* Dispatch functions for Idea cipher modes ecb, cbc, ofb, cfb */
#include "cipher_idea.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn idea_freectx;
static OSSL_OP_cipher_dupctx_fn idea_dupctx;

@ -10,7 +10,7 @@
/* Dispatch functions for RC2 cipher modes ecb, cbc, ofb, cfb */
#include "cipher_rc2.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
#define RC2_40_MAGIC 0xa0

@ -10,7 +10,7 @@
/* Dispatch functions for RC4 ciphers */
#include "cipher_rc4.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* TODO (3.0) Figure out what flags are required */
#define RC4_FLAGS EVP_CIPH_FLAG_DEFAULT_ASN1

@ -10,7 +10,7 @@
/* Dispatch functions for RC5 cipher modes ecb, cbc, ofb, cfb */
#include "cipher_rc5.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
static OSSL_OP_cipher_freectx_fn rc5_freectx;

@ -10,7 +10,7 @@
/* Dispatch functions for Seed cipher modes ecb, cbc, ofb, cfb */
#include "cipher_seed.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn seed_freectx;
static OSSL_OP_cipher_dupctx_fn seed_dupctx;

@ -10,7 +10,7 @@
/* Dispatch functions for cast cipher modes ecb, cbc, ofb, cfb */
#include "cipher_sm4.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_cipher_freectx_fn sm4_freectx;
static OSSL_OP_cipher_dupctx_fn sm4_dupctx;

@ -10,7 +10,7 @@
#include "prov/ciphercommon.h"
#include "cipher_tdes.h"
#include "crypto/rand.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
void *tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits,

@ -8,7 +8,7 @@
*/
#include "cipher_tdes_default.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* tdes_ede3_ofb_functions */
IMPLEMENT_tdes_cipher(ede3, EDE3, ofb, OFB, TDES_FLAGS, 64*3, 8, 64, stream);

@ -11,7 +11,7 @@
#include "cipher_tdes_default.h"
#include "crypto/evp.h"
#include "crypto/rand.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
/* TODO (3.0) Figure out what flags are requred */

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include "prov/blake2.h"
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
OSSL_OP_digest_init_fn blake2s256_init;
OSSL_OP_digest_init_fn blake2b512_init;

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include <openssl/md2.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* md2_functions */
IMPLEMENT_digest_functions(md2, MD2_CTX,

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include <openssl/md4.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* md4_functions */
IMPLEMENT_digest_functions(md4, MD4_CTX,

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include <openssl/md5.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* md5_functions */
IMPLEMENT_digest_functions(md5, MD5_CTX,

@ -14,7 +14,7 @@
#include <openssl/core_names.h>
#include "prov/md5_sha1.h"
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_digest_set_ctx_params_fn md5_sha1_set_ctx_params;
static OSSL_OP_digest_settable_ctx_params_fn md5_sha1_settable_ctx_params;

@ -13,7 +13,7 @@
#include <openssl/core_names.h>
#include <openssl/err.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
static OSSL_OP_digest_set_ctx_params_fn mdc2_set_ctx_params;

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include <openssl/ripemd.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* ripemd160_functions */
IMPLEMENT_digest_functions(ripemd160, RIPEMD160_CTX,

@ -15,7 +15,7 @@
#include <openssl/params.h>
#include <openssl/core_names.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "crypto/sha.h"
static OSSL_OP_digest_set_ctx_params_fn sha1_set_ctx_params;

@ -15,7 +15,7 @@
#include <openssl/err.h>
#include "internal/sha3.h"
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/providercommonerr.h"
/*

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include "internal/sm3.h"
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* sm3_functions */
IMPLEMENT_digest_functions(sm3, SM3_CTX,

@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include <openssl/whrlpool.h>
#include "prov/digestcommon.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/* wp_functions */
IMPLEMENT_digest_functions(wp, WHIRLPOOL_CTX,

@ -12,7 +12,7 @@
#include <openssl/core_names.h>
#include <openssl/dh.h>
#include <openssl/params.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_keyexch_newctx_fn dh_newctx;
static OSSL_OP_keyexch_init_fn dh_init;

@ -19,7 +19,7 @@
#include "crypto/evp.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_util.h"
#include "e_os.h"

@ -37,7 +37,7 @@
#include "internal/cryptlib.h"
#include "crypto/evp.h"
#include "internal/numbers.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/provider_util.h"
#include "internal/providercommonerr.h"

@ -19,7 +19,7 @@
#include "crypto/evp.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_util.h"
#include "pbkdf2.h"

@ -16,10 +16,10 @@
#include <openssl/core_names.h>
#include "crypto/evp.h"
#include "internal/numbers.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#ifndef OPENSSL_NO_SCRYPT

@ -18,7 +18,7 @@
#include "crypto/evp.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
# include "internal/provider_util.h"
/* See RFC 4253, Section 7.2 */

@ -47,7 +47,7 @@
#include "crypto/evp.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_util.h"
typedef struct {

@ -57,7 +57,7 @@
#include "crypto/evp.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_util.h"
#include "e_os.h"

@ -27,7 +27,7 @@
# include "crypto/evp.h"
# include "internal/provider_ctx.h"
# include "internal/providercommonerr.h"
# include "internal/provider_algs.h"
# include "prov/implementations.h"
# include "internal/provider_util.h"
# define X942KDF_MAX_INLEN (1 << 30)

@ -12,7 +12,7 @@
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/params.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_keymgmt_importkey_fn dh_importkey;

@ -12,7 +12,7 @@
#include <openssl/bn.h>
#include <openssl/dsa.h>
#include <openssl/params.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
static OSSL_OP_keymgmt_importkey_fn dsa_importkey;

@ -14,7 +14,7 @@
#include "prov/blake2.h"
#include "internal/cryptlib.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/*
* Forward declaration of everything implemented here. This is not strictly

@ -14,7 +14,7 @@
#include <openssl/evp.h>
#include <openssl/cmac.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/provider_util.h"

@ -16,7 +16,7 @@
#include <openssl/err.h>
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/provider_util.h"

@ -14,7 +14,7 @@
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/provider_util.h"

@ -55,7 +55,7 @@
#include <openssl/err.h>
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
#include "internal/provider_util.h"

@ -22,7 +22,7 @@
#include "../../../crypto/poly1305/poly1305_local.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/*
* Forward declaration of everything implemented here. This is not strictly

@ -23,7 +23,7 @@
#include "../../../crypto/siphash/siphash_local.h"
#include "internal/providercommonerr.h"
#include "internal/provider_algs.h"
#include "prov/implementations.h"
/*
* Forward declaration of everything implemented here. This is not strictly

@ -13,7 +13,7 @@
#include <openssl/dsa.h>
#include <openssl/params.h>
#include <openssl/evp.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#include "internal/provider_ctx.h"
static OSSL_OP_signature_newctx_fn dsa_newctx;

@ -13,7 +13,7 @@
#include <openssl/core_numbers.h>
#include <openssl/core_names.h>
#include <openssl/params.h>
#include "internal/provider_algs.h"
#include "prov/implementations.h"
#ifdef STATIC_LEGACY
OSSL_provider_init_fn ossl_legacy_provider_init;

Loading…
Cancel
Save