summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2024-08-31 12:46:55 +0000
committerjsing <>2024-08-31 12:46:55 +0000
commite93803270c64331d139d546753e2d957d3e5c1c4 (patch)
treee54a584d1eaaf33f8f44d7fc6cc4d5b4dd00343f
parent4d860a7d33bdb05e5782330d5085fda5e809bd72 (diff)
downloadopenbsd-e93803270c64331d139d546753e2d957d3e5c1c4.tar.gz
openbsd-e93803270c64331d139d546753e2d957d3e5c1c4.tar.bz2
openbsd-e93803270c64331d139d546753e2d957d3e5c1c4.zip
Update for OPENSSL_cpu_caps() now being machine independent.
ok tb@
-rw-r--r--src/lib/libssl/ssl_ciph.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index aba8fbd26e..8f7345f068 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.148 2024/08/31 10:51:48 tb Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.149 2024/08/31 12:46:55 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1112,11 +1112,7 @@ ssl_cipher_process_rulestr(const char *rule_str, CIPHER_ORDER **head_p,
1112static inline int 1112static inline int
1113ssl_aes_is_accelerated(void) 1113ssl_aes_is_accelerated(void)
1114{ 1114{
1115#if defined(__i386__) || defined(__x86_64__) 1115 return (OPENSSL_cpu_caps() & CRYPTO_CPU_CAPS_ACCELERATED_AES) != 0;
1116 return ((OPENSSL_cpu_caps() & (1ULL << 57)) != 0);
1117#else
1118 return (0);
1119#endif
1120} 1116}
1121 1117
1122STACK_OF(SSL_CIPHER) * 1118STACK_OF(SSL_CIPHER) *