Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 215cbd3c authored by Roberto Sassu's avatar Roberto Sassu Committed by Greg Kroah-Hartman
Browse files

tools build: Switch to new openssl API for test-libcrypto 



commit 5b245985a6de5ac18b5088c37068816d413fb8ed upstream.

Switch to new EVP API for detecting libcrypto, as Fedora 36 returns an
error when it encounters the deprecated function MD5_Init() and the others.

The error would be interpreted as missing libcrypto, while in reality it is
not.

Fixes: 6e8ccb4f ("tools/bpf: properly account for libbfd variations")
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: bpf@vger.kernel.org
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: KP Singh <kpsingh@kernel.org>
Cc: llvm@lists.linux.dev
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Song Liu <song@kernel.org>
Cc: Stanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/r/20220719170555.2576993-4-roberto.sassu@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9120426

tools/build/feature/test-libcrypto.c

+11 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <openssl/evp.h>

#include <openssl/sha.h>

#include <openssl/md5.h>



int main(void)

{

	MD5_CTX context;

	EVP_MD_CTX *mdctx;

	unsigned char md[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];

	unsigned char dat[] = "12345";

	unsigned int digest_len;



	MD5_Init(&context);

	MD5_Update(&context, &dat[0], sizeof(dat));

	MD5_Final(&md[0], &context);

	mdctx = EVP_MD_CTX_new();

	if (!mdctx)

		return 0;



	EVP_DigestInit_ex(mdctx, EVP_md5(), NULL);

	EVP_DigestUpdate(mdctx, &dat[0], sizeof(dat));

	EVP_DigestFinal_ex(mdctx, &md[0], &digest_len);

	EVP_MD_CTX_free(mdctx);



	SHA1(&dat[0], sizeof(dat), &md[0]);