Remzona54/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 13:57:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Do not use OSSL_PARAM_DIGEST_SIZE for blake2 in openssl

Browse source
This commit is contained in:
Vladimir Dubrovin 2026-05-08 16:14:09 +03:00
parent f8c22d5f91
commit 6963af7614
2 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/3proxy_crypt.c
View file

@ -37,16 +37,8 @@ EVP_MD *md5_hash = NULL;
int blake2b_init_3p(blake2b_state *S, size_t outlen) { int blake2b_init_3p(blake2b_state *S, size_t outlen) {
*S = EVP_MD_CTX_new(); *S = EVP_MD_CTX_new();
if (!*S) return -1; if (!*S) return -1;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
size_t sz = outlen;
OSSL_PARAM params[2];
params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &sz);
params[1] = OSSL_PARAM_construct_end();
if (!EVP_DigestInit_ex2(*S, EVP_blake2b512(), params)) {
#else
(void)outlen; (void)outlen;
if (!EVP_DigestInit_ex(*S, EVP_blake2b512(), NULL)) { if (!EVP_DigestInit_ex(*S, EVP_blake2b512(), NULL)) {
#endif
EVP_MD_CTX_free(*S); EVP_MD_CTX_free(*S);
*S = NULL; *S = NULL;
return -1; return -1;
@ -60,19 +52,29 @@ int blake2b_update_3p(blake2b_state *S, const void *in, size_t inlen) {
} }
int blake2b_final_3p(blake2b_state *S, void *out, size_t outlen) { int blake2b_final_3p(blake2b_state *S, void *out, size_t outlen) {
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
unsigned int len = 0;
int ret = EVP_DigestFinal_ex(*S, out, &len) ? 0 : -1;
#else
unsigned char tmp[64]; unsigned char tmp[64];
unsigned int len = 0; unsigned int len = 0;
int ret = EVP_DigestFinal_ex(*S, tmp, &len) ? 0 : -1; int ret = EVP_DigestFinal_ex(*S, tmp, &len) ? 0 : -1;
memset(out, 0, outlen);
if (ret == 0) memcpy(out, tmp, outlen); if (ret == 0) memcpy(out, tmp, outlen);
#endif
EVP_MD_CTX_free(*S); EVP_MD_CTX_free(*S);
*S = NULL; *S = NULL;
return ret; return ret;
} }
#else
int blake2b_final_3p(blake2b_state *S, void *out, size_t outlen) {
int res;
if(outlen < 64){
unsigned char tmp[64];
res = blake2b_final(S, tmp, 64);
memcpy(out, tmp, outlen > 64? 64 : outlen);
return res;
}
res = blake2b_final(S, out, 64);
if(outlen > 64) memset(out + 64, 0, outlen - 64);
return res;
}
#endif /* WITH_SSL && OPENSSL >= 1.1 */ #endif /* WITH_SSL && OPENSSL >= 1.1 */
void void
@ -287,15 +289,11 @@ int main(int argc, char* argv[]){
"Performs NT crypt if no salt specified, BLAKE2 crypt with salt\n" "Performs NT crypt if no salt specified, BLAKE2 crypt with salt\n"
#else #else
"Performs BLAKE2 crypt with salt\n" "Performs BLAKE2 crypt with salt\n"
#endif
"This software uses:\n"
#ifdef WITH_SSL
" OpenSSL EVP (MD4, MD5, BLAKE2b)\n"
#else
" BLAKE2 reference implementation\n"
#endif #endif
, ,
#ifdef WITH_SSL
argv[0], argv[0],
#endif
argv[0]); argv[0]);
return 1; return 1;
} }

5
src/blake2_compat.h
View file

@ -13,16 +13,15 @@ typedef EVP_MD_CTX *blake2b_state;
int blake2b_init_3p(blake2b_state *S, size_t outlen); int blake2b_init_3p(blake2b_state *S, size_t outlen);
int blake2b_update_3p(blake2b_state *S, const void *in, size_t inlen); int blake2b_update_3p(blake2b_state *S, const void *in, size_t inlen);
int blake2b_final_3p(blake2b_state *S, void *out, size_t outlen);
#else #else
#include "libs/blake2.h" #include "libs/blake2.h"
#define blake2b_init_3p blake2b_init #define blake2b_init_3p(A,b) blake2b_init(A,64)
#define blake2b_update_3p blake2b_update #define blake2b_update_3p blake2b_update
#define blake2b_final_3p blake2b_final
#endif #endif
int blake2b_final_3p(blake2b_state *S, void *out, size_t outlen);
#endif /* BLAKE2_COMPAT_H */ #endif /* BLAKE2_COMPAT_H */