diff options
| author |   florian <florian@openbsd.org> | 2020-01-09 13:52:22 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-01-09 13:52:22 +0000 |
| commit | 2ae186b371b3c4311a5ce886578bf6c39ccbf467 (patch) | |
| tree | 9461ddc38b73a3dda913f3d2d50ceb2f2c2287b1 /usr.sbin/bind/lib/dns/rcode.c | |
| parent | unifdef printf and string functions: (diff) | |
| download | wireguard-openbsd-2ae186b371b3c4311a5ce886578bf6c39ccbf467.tar.xz wireguard-openbsd-2ae186b371b3c4311a5ce886578bf6c39ccbf467.zip | |
unifdef pkcs11:
#undef USE_PKCS11
#undef PKCS11_TOOLS
#undef PKCS11CRYPTO
#undef HAVE_PKCS11_GOST
#undef HAVE_PKCS11_ECDSA
#undef HAVE_PKCS11_ED25519
#undef HAVE_PKCS11_ED448
#define PK11_DH_DISABLE
#define PK11_DSA_DISABLE
#define PK11_FLAVOR
#define PK11_MD5_DISABLE
#undef PK11_SOFTHSMV2_FLAVOR
prodding deraadt@
Diffstat (limited to 'usr.sbin/bind/lib/dns/rcode.c')
| -rw-r--r-- | usr.sbin/bind/lib/dns/rcode.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/usr.sbin/bind/lib/dns/rcode.c b/usr.sbin/bind/lib/dns/rcode.c index 80d6ea1271f..52d1033eb0f 100644 --- a/usr.sbin/bind/lib/dns/rcode.c +++ b/usr.sbin/bind/lib/dns/rcode.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rcode.c,v 1.7 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: rcode.c,v 1.8 2020/01/09 13:52:23 florian Exp $ */ #include <config.h> #include <ctype.h> @@ -32,7 +32,7 @@ #include <isc/types.h> #include <isc/util.h> -#include <pk11/site.h> + #include <dns/cert.h> #include <dns/ds.h> @@ -109,26 +109,9 @@ /* RFC2535 section 7, RFC3110 */ -#ifndef PK11_MD5_DISABLE -#define MD5_SECALGNAMES \ - { DNS_KEYALG_RSAMD5, "RSAMD5", 0 }, \ - { DNS_KEYALG_RSAMD5, "RSA", 0 }, -#else #define MD5_SECALGNAMES -#endif -#ifndef PK11_DH_DISABLE -#define DH_SECALGNAMES \ - { DNS_KEYALG_DH, "DH", 0 }, -#else #define DH_SECALGNAMES -#endif -#ifndef PK11_DSA_DISABLE -#define DSA_SECALGNAMES \ - { DNS_KEYALG_DSA, "DSA", 0 }, \ - { DNS_KEYALG_NSEC3DSA, "NSEC3DSA", 0 }, -#else #define DSA_SECALGNAMES -#endif #define SECALGNAMES \ MD5_SECALGNAMES \ |