diff options
| author | Richard Levitte <levitte@openssl.org> | 2023-08-14 12:38:44 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-08-15 15:23:16 +0200 |
| commit | 98d81174d3763053b32b8cfd7225acd0a111d456 (patch) | |
| tree | 474ace53d639e846f155269dd9271b5cafb72f54 /crypto | |
| parent | 4efd84fdd648279367683b280c9d9feb2ba54e9e (diff) | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/context.c | 2 | ||||
| -rw-r--r-- | crypto/encode_decode/decoder_pkey.c | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_fetch.c | 2 | ||||
| -rw-r--r-- | crypto/provider_core.c | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/crypto/context.c b/crypto/context.c index f84a00566c..ba67b0c618 100644 --- 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 e3aaa44902..d00ec75bea 100644 --- 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 b21c6f283b..1128131299 100644 --- 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 14f0d527fe..4cb3e21f69 100644 --- 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 |