diff options
| author |   jsing <jsing@openbsd.org> | 2015-09-13 12:34:02 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-09-13 12:34:02 +0000 |
| commit | 60ecba46fd442156987a6f3bd83f1709c03717ad (patch) | |
| tree | f9a1186cf6e43de6e854c9e21fc1bae50c177a85 /lib/libssl/src | |
| parent | Locators are long now. (diff) | |
| download | wireguard-openbsd-60ecba46fd442156987a6f3bd83f1709c03717ad.tar.xz wireguard-openbsd-60ecba46fd442156987a6f3bd83f1709c03717ad.zip | |
Switch to miod's shiny new OPENSSL_cpu_caps() and we can now also enable
the AES acceleration checking for i386.
ok beck@ miod@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_ciph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index 42fdaad338c..46f1697fec6 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/lib/libssl/src/ssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.82 2015/09/13 09:10:01 jsing Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.83 2015/09/13 12:34:02 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1361,8 +1361,8 @@ ssl_cipher_process_rulestr(const char *rule_str, CIPHER_ORDER **head_p, static inline int ssl_aes_is_accelerated(void) { -#if defined(__x86_64__) - return ((OPENSSL_ia32cap_loc()[0] & (1UL << 57)) != 0); +#if defined(__i386__) || defined(__x86_64__) + return ((OPENSSL_cpu_caps() & (1ULL << 57)) != 0); #else return (0); #endif |