Date: Fri, 10 Jul 2020 13:10:56 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541860 - in head/mail/opendkim: . files Message-ID: <202007101310.06ADAuFr050224@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Jul 10 13:10:56 2020 New Revision: 541860 URL: https://svnweb.freebsd.org/changeset/ports/541860 Log: Unbreak the build with options GNUTLS and/or OPENDBX. PR: 247634 Added: head/mail/opendkim/files/patch-libopendkim_dkim.c (contents, props changed) Modified: head/mail/opendkim/pkg-plist Added: head/mail/opendkim/files/patch-libopendkim_dkim.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opendkim/files/patch-libopendkim_dkim.c Fri Jul 10 13:10:56 2020 (r541860) @@ -0,0 +1,34 @@ +--- libopendkim/dkim.c.orig 2015-05-12 18:43:09 UTC ++++ libopendkim/dkim.c +@@ -5301,6 +5301,10 @@ dkim_sig_process(DKIM *dkim, DKIM_SIGINFO *sig) + size_t diglen = 0; + #ifdef USE_GNUTLS + gnutls_datum_t key; ++#if GNUTLS_VERSION_MAJOR > 2 ++ gnutls_digest_algorithm_t hash; ++ gnutls_sign_algorithm_t sign_algo; ++#endif + #else /* USE_GNUTLS */ + BIO *key; + #endif /* USE_GNUTLS */ +@@ -5442,7 +5446,20 @@ dkim_sig_process(DKIM *dkim, DKIM_SIGINFO *sig) + return DKIM_STAT_OK; + } + ++#if GNUTLS_VERSION_MAJOR < 3 + rsastat = gnutls_pubkey_verify_hash(rsa->rsa_pubkey, 0, ++#else ++ hash = dkim_libfeature(dkim->dkim_libhandle, ++ DKIM_FEATURE_SHA256) && ++ sig->sig_hashtype == DKIM_HASHTYPE_SHA256 ++ ? GNUTLS_DIG_SHA256 : GNUTLS_DIG_SHA1; ++ ++ sign_algo = gnutls_pk_to_sign(GNUTLS_PK_RSA, hash); ++ assert(sign_algo != GNUTLS_SIGN_UNKNOWN); ++ ++ rsastat = gnutls_pubkey_verify_hash2(rsa->rsa_pubkey, ++ sign_algo, 0, ++#endif + &rsa->rsa_digest, + &rsa->rsa_sig); + if (rsastat < 0) Modified: head/mail/opendkim/pkg-plist ============================================================================== --- head/mail/opendkim/pkg-plist Fri Jul 10 11:54:29 2020 (r541859) +++ head/mail/opendkim/pkg-plist Fri Jul 10 13:10:56 2020 (r541860) @@ -8,10 +8,6 @@ %%LUA%%bin/miltertest %%LUA%%man/man3/opendkim-lua.3.gz %%LUA%%man/man8/miltertest.8.gz -%%OPENDBX%%bin/opendkim-spam -%%OPENDBX%%sbin/opendkim-importstats -%%OPENDBX%%man/man1/opendkim-spam.1.gz -%%OPENDBX%%man/man8/opendkim-importstats.8.gz %%RBL%%include/rbl/rbl.h %%RBL%%lib/librbl.a %%RBL%%lib/librbl.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007101310.06ADAuFr050224>