diff options
| author | miod <> | 2015-09-13 10:02:49 +0000 |
|---|---|---|
| committer | miod <> | 2015-09-13 10:02:49 +0000 |
| commit | 83f57d181d785f30f940e80aab02506a0ccdffb8 (patch) | |
| tree | 360415740c3bcfc8c18a28a02f9843f406141836 /src/lib/libcrypto/crypto.h | |
| parent | 6dfed4d8d462a506b9ea9e0e96092d0eda8373f1 (diff) | |
| download | openbsd-83f57d181d785f30f940e80aab02506a0ccdffb8.tar.gz openbsd-83f57d181d785f30f940e80aab02506a0ccdffb8.tar.bz2 openbsd-83f57d181d785f30f940e80aab02506a0ccdffb8.zip | |
Add a new interface, OPENSSL_cpu_caps(), to return the currently running
cpu's specific hardware capabilities users of libcrypto might be interested
in, as an integer value. This deprecates the existing OPENSSL_ia32cap()
macro and the OPENSSL_ia32cap_loc() function (which returns the pointer so
that you can mess with stuff you shouldn't mess with).
Interpreting the value returned by OPENSSL_cpu_caps() is, of course,
machine-dependent.
Minor version bump for libcrypto.
ok beck@ jsing@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index 612b390f27..f53b858d19 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto.h,v 1.37 2015/09/10 16:35:15 jsing Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.38 2015/09/13 10:02:49 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 | * |
| @@ -496,6 +496,9 @@ void OpenSSLDie(const char *file, int line, const char *assertion); | |||
| 496 | 496 | ||
| 497 | unsigned long *OPENSSL_ia32cap_loc(void); | 497 | unsigned long *OPENSSL_ia32cap_loc(void); |
| 498 | #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc())) | 498 | #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc())) |
| 499 | |||
| 500 | uint64_t OPENSSL_cpu_caps(void); | ||
| 501 | |||
| 499 | int OPENSSL_isservice(void); | 502 | int OPENSSL_isservice(void); |
| 500 | 503 | ||
| 501 | void OPENSSL_init(void); | 504 | void OPENSSL_init(void); |
