exim: update to version 4.95

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2021-10-09 04:08:28 +01:00
parent 264f7b2f5f
commit 40c71110f0
3 changed files with 103 additions and 55 deletions

View File

@@ -13,7 +13,7 @@
}
--- a/src/pdkim/signing.c
+++ b/src/pdkim/signing.c
@@ -699,7 +699,6 @@ return NULL;
@@ -704,7 +704,6 @@ return NULL;
void
exim_dkim_init(void)
{
@@ -34,18 +34,19 @@
#ifndef OPENSSL_NO_ECDH
# include <openssl/ec.h>
#endif
@@ -1462,8 +1465,8 @@ if (!EVP_PKEY_assign_RSA(pkey, rsa))
@@ -834,8 +837,9 @@ if (!EVP_PKEY_assign_RSA(pkey, rsa))
X509_set_version(x509, 2); /* N+1 - version 3 */
ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
-X509_gmtime_adj(X509_get_notBefore(x509), 0);
-X509_gmtime_adj(X509_get_notAfter(x509), (long)60 * 60); /* 1 hour */
-X509_gmtime_adj(X509_get_notAfter(x509), (long)2 * 60 * 60); /* 2 hour */
+X509_gmtime_adj(X509_getm_notBefore(x509), 0);
+X509_gmtime_adj(X509_getm_notAfter(x509), (long)60 * 60); /* 1 hour */
+X509_gmtime_adj(X509_getm_notAfter(x509), (long)2 * 60 * 60); /* 2 hour */
+
X509_set_pubkey(x509, pkey);
name = X509_get_subject_name(x509);
@@ -3897,8 +3900,8 @@ fprintf(f, "Library version: OpenSSL: Co
@@ -4512,8 +4516,8 @@ fprintf(f, "Library version: OpenSSL: Co
" Runtime: %s\n"
" : %s\n",
OPENSSL_VERSION_TEXT,
@@ -56,7 +57,7 @@
/* third line is 38 characters for the %s and the line is 73 chars long;
the OpenSSL output includes a "built on: " prefix already. */
}
@@ -3940,8 +3943,6 @@ if (pidnow != pidlast)
@@ -4555,8 +4559,6 @@ if (pidnow != pidlast)
is unique for each thread", this doesn't apparently apply across processes,
so our own warning from vaguely_random_number_fallback() applies here too.
Fix per PostgreSQL. */