summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2010-12-16 16:56:09 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2010-12-16 16:56:09 +0000
commit604a765cebee96d297bbdef22258d104f7398dce (patch)
tree56703ea5173f02e2d0e077e0f08552bbce23de54
parent7fa20791fd9a167a5cb2524535781a58ff18026e (diff)
move CRYPTO_VIAC3_MAX out of cryptodev.h and into the only
file it will be used from. requested by/ok mikeb@
-rw-r--r--lib/libssl/src/crypto/engine/hw_cryptodev.c2
-rw-r--r--sys/crypto/cryptodev.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/src/crypto/engine/hw_cryptodev.c b/lib/libssl/src/crypto/engine/hw_cryptodev.c
index d6d78da9b26..0e80ca051a5 100644
--- a/lib/libssl/src/crypto/engine/hw_cryptodev.c
+++ b/lib/libssl/src/crypto/engine/hw_cryptodev.c
@@ -74,6 +74,8 @@ ENGINE_load_cryptodev(void)
static int check_viac3aes(void);
#endif
+#define CRYPTO_VIAC3_MAX 3
+
struct dev_crypto_state {
struct session_op d_sess;
int d_fd;
diff --git a/sys/crypto/cryptodev.h b/sys/crypto/cryptodev.h
index 8c25cec98c6..8f345f4f5ea 100644
--- a/sys/crypto/cryptodev.h
+++ b/sys/crypto/cryptodev.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptodev.h,v 1.54 2010/12/16 00:07:25 jsg Exp $ */
+/* $OpenBSD: cryptodev.h,v 1.55 2010/12/16 16:56:08 jsg Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -110,8 +110,6 @@
#define CRYPTO_AES_GMAC 27
#define CRYPTO_ALGORITHM_MAX 27 /* Keep updated */
-#define CRYPTO_VIAC3_MAX 3
-
/* Algorithm flags */
#define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */
#define CRYPTO_ALG_FLAG_RNG_ENABLE 0x02 /* Has HW RNG for DH/DSA */