openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

rename MIN() macro 

MIN is a rather generic name and results in a name clash when trying to
port tianocore over to openssl 3.0.  Use the usual ossl prefix and
rename the macro to ossl_min() to solve this.

CLA: trivial

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17219)
This commit is contained in:
Gerd Hoffmann 2021-12-07 10:22:38 +01:00 committed by Pauli
parent 684326d3bd
commit f4f77c2d97
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/implementations/kdfs/kbkdf.c
View File

@ -46,7 +46,7 @@
#include "e_os.h"
#define MIN(a, b) ((a) < (b)) ? (a) : (b)
#define ossl_min(a, b) ((a) < (b)) ? (a) : (b)
typedef enum {
COUNTER = 0,
@ -197,7 +197,7 @@ static int derive(EVP_MAC_CTX *ctx_init, kbkdf_mode mode, unsigned char *iv,
goto done;
to_write = ko_len - written;
memcpy(ko + written, k_i, MIN(to_write, h));
memcpy(ko + written, k_i, ossl_min(to_write, h));
written += h;
k_i_len = h;