diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-06-20 12:01:55 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-06-20 12:01:55 +0000 |
| commit | 8e79fb7010fd780f628420536e4f5b500524c7af (patch) | |
| tree | cdc5c92bb94595da1f52d9649d7fc164dbe1d9e1 | |
| parent | f0005c64de99404ba0dd8aa8efed91d02614761b (diff) | |
Put CRYPTO_memcmp() under #ifndef LIBRESSL_INTERNAL.
ok doug@ deraadt@
| -rw-r--r-- | lib/libssl/src/crypto/crypto.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/crypto.h b/lib/libssl/src/crypto/crypto.h index 4012f1c99aa..68028d9c132 100644 --- a/lib/libssl/src/crypto/crypto.h +++ b/lib/libssl/src/crypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.34 2015/04/11 16:16:15 deraadt Exp $ */ +/* $OpenBSD: crypto.h,v 1.35 2015/06/20 12:01:54 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -512,12 +512,14 @@ int OPENSSL_isservice(void); void OPENSSL_init(void); +#ifndef LIBRESSL_INTERNAL /* CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal. It * takes an amount of time dependent on |len|, but independent of the contents * of |a| and |b|. Unlike memcmp, it cannot be used to put elements into a * defined order as the return value when a != b is undefined, other than to be * non-zero. */ int CRYPTO_memcmp(const void *a, const void *b, size_t len); +#endif /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes |