From 75e4c0869e9a5db6c9980fdb74d35c3256234260 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 8 Oct 2021 22:54:22 -0500 Subject: [PATCH] DH: move declaration of wc_DhPublicKeyDecode() from dh.h to asn.h (it is defined in asn.c). --- wolfssl/wolfcrypt/asn.h | 4 ++++ wolfssl/wolfcrypt/dh.h | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index b7b241a85..80a7ece30 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -1819,6 +1819,10 @@ WOLFSSL_LOCAL int wc_CheckPrivateKeyCert(const byte* key, word32 keySz, DecodedC WOLFSSL_LOCAL int wc_CheckPrivateKey(const byte* privKey, word32 privKeySz, const byte* pubKey, word32 pubKeySz, enum Key_Sum ks); WOLFSSL_LOCAL int StoreDHparams(byte* out, word32* outLen, mp_int* p, mp_int* g); +#ifdef WOLFSSL_DH_EXTRA +WOLFSSL_API int wc_DhPublicKeyDecode(const byte* input, word32* inOutIdx, + DhKey* key, word32 inSz); +#endif WOLFSSL_LOCAL int FlattenAltNames( byte*, word32, const DNS_entry*); WOLFSSL_LOCAL int wc_EncodeName(EncodedName* name, const char* nameStr, diff --git a/wolfssl/wolfcrypt/dh.h b/wolfssl/wolfcrypt/dh.h index 4777b2b7c..3adaba980 100644 --- a/wolfssl/wolfcrypt/dh.h +++ b/wolfssl/wolfcrypt/dh.h @@ -138,11 +138,9 @@ WOLFSSL_API int wc_DhCopyNamedKey(int name, byte* p, word32* pSz, byte* g, word32* gSz, byte* q, word32* qSz); #ifdef WOLFSSL_DH_EXTRA -WOLFSSL_API int wc_DhPublicKeyDecode(const byte* input, word32* inOutIdx, - DhKey* key, word32 inSz); WOLFSSL_API int wc_DhImportKeyPair(DhKey* key, const byte* priv, word32 privSz, const byte* pub, word32 pubSz); -WOLFSSL_API int wc_DhExportKeyPair(DhKey* key, byte* priv, word32* pPrivSz, +WOLFSSL_API int wc_DhExportKeyPair(DhKey* key, byte* priv, word32* pPrivSz, byte* pub, word32* pPubSz); WOLFSSL_LOCAL int wc_DhKeyCopy(DhKey* src, DhKey* dst); #endif