From b6a59c1cb357bb67d55ff4e5fac7866a7c48851f Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 15 Jun 2004 23:41:50 +0000 Subject: machdep.xcrypt now has a different meaning: Instead of > 0 indicating that AES is there, we now have 3 flag bits: C3_HAS_AES, C3_HAS_SHA (SHA1 & SHA256), and C3_HAS_MM (RSA). Change this code to only look at C3_HAS_AES for now. --- lib/libssl/src/crypto/engine/hw_cryptodev.c | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/libssl/src/crypto/engine/hw_cryptodev.c b/lib/libssl/src/crypto/engine/hw_cryptodev.c index 21de0a9fdd0..d12d23d9fc2 100644 --- a/lib/libssl/src/crypto/engine/hw_cryptodev.c +++ b/lib/libssl/src/crypto/engine/hw_cryptodev.c @@ -744,20 +744,22 @@ check_viac3aes(void) if (value == 0) return (0); - cryptodev_aes_128_cbc.init = xcrypt_init_key; - cryptodev_aes_128_cbc.do_cipher = xcrypt_cipher; - cryptodev_aes_128_cbc.cleanup = xcrypt_cleanup; - cryptodev_aes_128_cbc.ctx_size = sizeof(AES_KEY); - - cryptodev_aes_192_cbc.init = xcrypt_init_key; - cryptodev_aes_192_cbc.do_cipher = xcrypt_cipher; - cryptodev_aes_192_cbc.cleanup = xcrypt_cleanup; - cryptodev_aes_192_cbc.ctx_size = sizeof(AES_KEY); - - cryptodev_aes_256_cbc.init = xcrypt_init_key; - cryptodev_aes_256_cbc.do_cipher = xcrypt_cipher; - cryptodev_aes_256_cbc.cleanup = xcrypt_cleanup; - cryptodev_aes_256_cbc.ctx_size = sizeof(AES_KEY); + if (value & C3_HAS_AES) { + cryptodev_aes_128_cbc.init = xcrypt_init_key; + cryptodev_aes_128_cbc.do_cipher = xcrypt_cipher; + cryptodev_aes_128_cbc.cleanup = xcrypt_cleanup; + cryptodev_aes_128_cbc.ctx_size = sizeof(AES_KEY); + + cryptodev_aes_192_cbc.init = xcrypt_init_key; + cryptodev_aes_192_cbc.do_cipher = xcrypt_cipher; + cryptodev_aes_192_cbc.cleanup = xcrypt_cleanup; + cryptodev_aes_192_cbc.ctx_size = sizeof(AES_KEY); + + cryptodev_aes_256_cbc.init = xcrypt_init_key; + cryptodev_aes_256_cbc.do_cipher = xcrypt_cipher; + cryptodev_aes_256_cbc.cleanup = xcrypt_cleanup; + cryptodev_aes_256_cbc.ctx_size = sizeof(AES_KEY); + } return (value); } #endif /* __i386__ */ -- cgit v1.2.3