Commit Diff

Commit:
3b048969957965668db0513c3bf3da410aadd305
From:
Martijn van Duren <martijn@openbsd.org>
Date:
Message:
Remove HAVE_ED25519 guard. It should be commonplace enough by now
Actions:
Patch | Tree
commit - 9b92b3eadcdd98a43e0b483b6b99d9869f4d4d6e
commit + 3b048969957965668db0513c3bf3da410aadd305
blob - 19746f9f6e583080de34e95de1b6cf3d9929833d
blob + 058d1919ba16827a0f2c32e04405586ccb316117
--- Makefile
+++ Makefile
@@ -7,9 +7,6 @@ MANDIR=		${LOCALBASE}/man/man
 
 SRCS+=		main.c mheader.c
 
-.ifdef HAVE_ED25519
-CFLAGS+=	-DHAVE_ED25519
-.endif
 .ifdef LIBCRYPTOPC
 CRYPT_CFLAGS!=	pkg-config --cflags ${LIBCRYPTOPC}
 CRYPT_LDFLAGS_L!=pkg-config --libs-only-L ${LIBCRYPTOPC}
blob - 1f97bd28f4172df60f52b0b2bae40bc4fa0817a0
blob + 011d047d5401c07146103693f7b58fc5289bdf94
--- Makefile.gnu
+++ Makefile.gnu
@@ -7,9 +7,6 @@ MANDIR=		${LOCALBASE}/share/man/man8
 
 SRCS+=		main.c mheader.c
 
-ifdef HAVE_ED25519
-CFLAGS+=	-DHAVE_ED25519
-endif
 ifdef LIBCRYPTOPC
 CRYPT_CFLAGS!=	pkg-config --cflags ${LIBCRYPTOPC}
 CRYPT_LDFLAGS_L!=pkg-config --libs-only-L ${LIBCRYPTOPC}
blob - 9530b9567aa518e2647bec71b1ed1575a3c848b6
blob + c6588e444e83cdff91e38513347f71cd16bb5651
--- main.c
+++ main.c
@@ -133,13 +133,11 @@ main(int argc, char *argv[])
 				hashalg = optarg + 4;
 				keyid = EVP_PKEY_RSA;
 				sephash = 0;
-#ifdef HAVE_ED25519
 			} else if (strncmp(optarg, "ed25519-", 8) == 0) {
 				hashalg = optarg + 8;
 				cryptalg = "ed25519";
 				keyid = EVP_PKEY_ED25519;
 				sephash = 1;
-#endif
 			} else
 				osmtpd_errx(1, "invalid algorithm");
 			break;
@@ -623,7 +621,6 @@ dkim_sign(struct osmtpd_ctx *ctx)
 	if (!sephash) {
 		if (EVP_DigestSignFinal(message->dctx, NULL, &linelen) != 1)
 			osmtpd_errx(1, "EVP_DigestSignFinal");
-#ifdef HAVE_ED25519
 	} else {
 		if (EVP_DigestFinal_ex(message->dctx, bdigest,
 		    &digestsz) != 1)
@@ -635,19 +632,16 @@ dkim_sign(struct osmtpd_ctx *ctx)
 		if (EVP_DigestSign(message->dctx, NULL, &linelen, bdigest,
 		    digestsz) != 1)
 			osmtpd_errx(1, "EVP_DigestSign");
-#endif
 	}
 	if ((tmp = malloc(linelen)) == NULL)
 		osmtpd_err(1, "malloc");
 	if (!sephash) {
 		if (EVP_DigestSignFinal(message->dctx, tmp, &linelen) != 1)
 			osmtpd_errx(1, "EVP_DigestSignFinal");
-#ifdef HAVE_ED25519
 	} else {
 		if (EVP_DigestSign(message->dctx, tmp, &linelen, bdigest,
 		    digestsz) != 1)
 			osmtpd_errx(1, "EVP_DigestSign");
-#endif
 	}
 	if ((b = malloc((((linelen + 2) / 3) * 4) + 1)) == NULL)
 		osmtpd_err(1, "malloc");