diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2021-12-07 10:22:38 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-12-08 22:02:59 +1100 |
| commit | f4f77c2d9756cee12875397276799a93f057d412 (patch) | |
| tree | 9b325f6d386cb4890f5630fee5215bdf0026e6fb | |
| parent | 684326d3bd3131debcdc410790e8dcf16f96103f (diff) | |
| download | openssl-new-f4f77c2d9756cee12875397276799a93f057d412.tar.gz | |
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)
| -rw-r--r-- | providers/implementations/kdfs/kbkdf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index a81cc6e0c0..22fc7b86ad 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -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; |