diff options
| -rw-r--r-- | sys/crypto/cryptodev.h | 5 | ||||
| -rw-r--r-- | sys/crypto/cryptosoft.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/crypto/cryptodev.h b/sys/crypto/cryptodev.h index a067bab8675..239181fded4 100644 --- a/sys/crypto/cryptodev.h +++ b/sys/crypto/cryptodev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptodev.h,v 1.63 2015/11/12 16:50:55 mikeb Exp $ */ +/* $OpenBSD: cryptodev.h,v 1.64 2015/11/12 16:57:00 mikeb Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -179,7 +179,6 @@ struct cryptop { #define CRYPTO_F_IMBUF 0x0001 /* Input/output are mbuf chains, otherwise contig */ #define CRYPTO_F_IOV 0x0002 /* Input/output are uio */ -#define CRYPTO_F_REL 0x0004 /* Must return data in same place */ #define CRYPTO_F_NOQUEUE 0x0008 /* Don't use crypto queue/thread */ #define CRYPTO_F_DONE 0x0010 /* request completed */ @@ -214,8 +213,6 @@ struct cryptocap { u_int8_t cc_flags; #define CRYPTOCAP_F_CLEANUP 0x01 #define CRYPTOCAP_F_SOFTWARE 0x02 -#define CRYPTOCAP_F_ENCRYPT_MAC 0x04 /* Can do encrypt-then-MAC (IPsec) */ -#define CRYPTOCAP_F_MAC_ENCRYPT 0x08 /* Can do MAC-then-encrypt (TLS) */ int (*cc_newsession) (u_int32_t *, struct cryptoini *); int (*cc_process) (struct cryptop *); diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c index f7a60f827dc..899f5dd0fb2 100644 --- a/sys/crypto/cryptosoft.c +++ b/sys/crypto/cryptosoft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptosoft.c,v 1.76 2015/11/03 01:35:16 mikeb Exp $ */ +/* $OpenBSD: cryptosoft.c,v 1.77 2015/11/12 16:57:00 mikeb Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -1162,8 +1162,7 @@ void swcr_init(void) { int algs[CRYPTO_ALGORITHM_MAX + 1]; - int flags = CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_ENCRYPT_MAC | - CRYPTOCAP_F_MAC_ENCRYPT; + int flags = CRYPTOCAP_F_SOFTWARE; swcr_id = crypto_get_driverid(flags); if (swcr_id < 0) { |