summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/crypto.h
diff options
context:
space:
mode:
authormiod <>2015-09-13 16:56:11 +0000
committermiod <>2015-09-13 16:56:11 +0000
commit28dd2541f031e76206c8fed414f254999804b7db (patch)
tree270174f49fcd04d8bcc9a537c4988d0f23338ed7 /src/lib/libcrypto/crypto.h
parentc03520e21faae31a4683523ca4e556bebdebfdba (diff)
downloadopenbsd-28dd2541f031e76206c8fed414f254999804b7db.tar.gz
openbsd-28dd2541f031e76206c8fed414f254999804b7db.tar.bz2
openbsd-28dd2541f031e76206c8fed414f254999804b7db.zip
Since a major bump of libcrypto is coming, remove OPENSSL_ia32cap and
OPENSSL_ia32cap_loc; nothing in ports uses them besides embedded copies of OpenSSL. This opens the `all hell gets loose' window.
Diffstat (limited to 'src/lib/libcrypto/crypto.h')
-rw-r--r--src/lib/libcrypto/crypto.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index f53b858d19..f9dde6e98e 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypto.h,v 1.38 2015/09/13 10:02:49 miod Exp $ */ 1/* $OpenBSD: crypto.h,v 1.39 2015/09/13 16:56:11 miod 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 *
@@ -494,9 +494,6 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
494void OpenSSLDie(const char *file, int line, const char *assertion); 494void OpenSSLDie(const char *file, int line, const char *assertion);
495#define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) 495#define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
496 496
497unsigned long *OPENSSL_ia32cap_loc(void);
498#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
499
500uint64_t OPENSSL_cpu_caps(void); 497uint64_t OPENSSL_cpu_caps(void);
501 498
502int OPENSSL_isservice(void); 499int OPENSSL_isservice(void);