Remove include/internal/decoder.h, as it's superfluous

The routines declared in there are entirely libcrypto internal, so
include/crypto/decoder.h is better suited for them.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/21733)

diff --git a/crypto/context.c b/crypto/context.c
index f84a00566c3a202756bbf5f78831aacf1e0524c8..ba67b0c618e9c010397eb5fd61989d79ad20fa72 100644 (file)
--- a/crypto/context.c
+++ b/crypto/context.c
@@ -14,7 +14,7 @@
 #include "internal/core.h"
 #include "internal/bio.h"
 #include "internal/provider.h"
-#include "internal/decoder.h"
+#include "crypto/decoder.h"
 #include "crypto/context.h"
 
 struct ossl_lib_ctx_st {

diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index e3aaa449023af800806b876183bb8d66b1b90bcf..d00ec75bead5dadb7e83f06420257f7bb386c9eb 100644 (file)
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -22,7 +22,6 @@
 #include "encoder_local.h"
 #include "internal/namemap.h"
 #include "internal/sizes.h"
-#include "internal/decoder.h"
 
 int OSSL_DECODER_CTX_set_passphrase(OSSL_DECODER_CTX *ctx,
                                     const unsigned char *kstr,

diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index b21c6f283b4f1b860c18afa48d23c4a635ad8292..11281312993b26aeba4704c95137cec51cc2a1cf 100644 (file)
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -17,7 +17,7 @@
 #include "internal/core.h"
 #include "internal/provider.h"
 #include "internal/namemap.h"
-#include "internal/decoder.h"
+#include "crypto/decoder.h"
 #include "crypto/evp.h"    /* evp_local.h needs it */
 #include "evp_local.h"
 

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 14f0d527fec3a5986587a0c1c2aa9c566667ef1e..4cb3e21f69bb9f563e7346f395e7a0485db85089 100644 (file)
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -28,7 +28,6 @@
 #include "internal/refcount.h"
 #include "internal/bio.h"
 #include "internal/core.h"
-#include "internal/decoder.h"
 #include "provider_local.h"
 #include "crypto/context.h"
 #ifndef FIPS_MODULE

diff --git a/include/crypto/decoder.h b/include/crypto/decoder.h
index 514190fca23b9cdddc402a252da83d0c8f41be6e..b7b91209df1f61573273478dfb7ee42ca824ca2c 100644 (file)
--- a/include/crypto/decoder.h
+++ b/include/crypto/decoder.h
@@ -33,4 +33,8 @@ int ossl_decoder_get_number(const OSSL_DECODER *encoder);
 int ossl_decoder_store_cache_flush(OSSL_LIB_CTX *libctx);
 int ossl_decoder_store_remove_all_provided(const OSSL_PROVIDER *prov);
 
+void *ossl_decoder_cache_new(OSSL_LIB_CTX *ctx);
+void ossl_decoder_cache_free(void *vcache);
+int ossl_decoder_cache_flush(OSSL_LIB_CTX *libctx);
+
 #endif

diff --git a/include/internal/decoder.h b/include/internal/decoder.h
deleted file mode 100644 (file)
index bfe1429..0000000
--- a/include/internal/decoder.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (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
- */
-
-#ifndef OSSL_INTERNAL_DECODER_H
-# define OSSL_INTERNAL_DECODER_H
-# pragma once
-
-void *ossl_decoder_cache_new(OSSL_LIB_CTX *ctx);
-void ossl_decoder_cache_free(void *vcache);
-int ossl_decoder_cache_flush(OSSL_LIB_CTX *libctx);
-
-#endif