diff options
author | jsing <> | 2017-04-29 21:48:44 +0000 |
---|---|---|
committer | jsing <> | 2017-04-29 21:48:44 +0000 |
commit | b06d97dea79680706abbabd672be9d0fb4582be7 (patch) | |
tree | 4195f946a49f85960dfe69d053abfc95e5e32dd9 /src/lib/libcrypto/crypto.h | |
parent | 8091128d66e4d00c534d48931f3bf1315266f5a9 (diff) | |
download | openbsd-b06d97dea79680706abbabd672be9d0fb4582be7.tar.gz openbsd-b06d97dea79680706abbabd672be9d0fb4582be7.tar.bz2 openbsd-b06d97dea79680706abbabd672be9d0fb4582be7.zip |
Stop calling OPENSSL_init() internally, since it is a no-op. Also place
it under #ifndef LIBRESSL_INTERNAL.
ok beck@
Diffstat (limited to 'src/lib/libcrypto/crypto.h')
-rw-r--r-- | src/lib/libcrypto/crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index c1ee78fb2f..068415f693 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto.h,v 1.40 2015/09/17 09:51:40 bcook Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.41 2017/04/29 21:48:43 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -499,9 +499,9 @@ uint64_t OPENSSL_cpu_caps(void); | |||
499 | 499 | ||
500 | int OPENSSL_isservice(void); | 500 | int OPENSSL_isservice(void); |
501 | 501 | ||
502 | #ifndef LIBRESSL_INTERNAL | ||
502 | void OPENSSL_init(void); | 503 | void OPENSSL_init(void); |
503 | 504 | ||
504 | #ifndef LIBRESSL_INTERNAL | ||
505 | /* CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal. It | 505 | /* CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal. It |
506 | * takes an amount of time dependent on |len|, but independent of the contents | 506 | * takes an amount of time dependent on |len|, but independent of the contents |
507 | * of |a| and |b|. Unlike memcmp, it cannot be used to put elements into a | 507 | * of |a| and |b|. Unlike memcmp, it cannot be used to put elements into a |