--- nail-11.25.orig/openssl.c 2005-07-15 12:20:00.000000000 +0200 +++ nail-11.25/openssl.c 2026-10-18 03:06:10.907439273 +0200 @@ -101,11 +101,11 @@ static void sslcatch(int s); static int ssl_rand_init(void); static void ssl_init(void); static int ssl_verify_cb(int success, X509_STORE_CTX *store); -static SSL_METHOD *ssl_select_method(const char *uhp); +static const SSL_METHOD *ssl_select_method(const char *uhp); static void ssl_load_verifications(struct sock *sp); static void ssl_certificate(struct sock *sp, const char *uhp); static enum okay ssl_check_host(const char *server, struct sock *sp); -static int smime_verify(struct message *m, int n, STACK *chain, +static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store); static EVP_CIPHER *smime_cipher(const char *name); static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata); @@ -132,7 +132,11 @@ ssl_rand_init(void) if ((cp = value("ssl-rand-egd")) != NULL) { cp = expand(cp); +#ifndef OPENSSL_NO_EGD if (RAND_egd(cp) == -1) { +#else + if (1) { +#endif fprintf(stderr, catgets(catd, CATSET, 245, "entropy daemon at \"%s\" not available\n"), cp); @@ -203,18 +207,24 @@ ssl_verify_cb(int success, X509_STORE_CT return 1; } -static SSL_METHOD * +static const SSL_METHOD * ssl_select_method(const char *uhp) { - SSL_METHOD *method; + const SSL_METHOD *method; char *cp; cp = ssl_method_string(uhp); if (cp != NULL) { - if (equal(cp, "ssl2")) + if (0) + ; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + else if (equal(cp, "ssl2")) method = SSLv2_client_method(); +#endif +#ifndef OPENSSL_NO_SSL3_METHOD else if (equal(cp, "ssl3")) method = SSLv3_client_method(); +#endif else if (equal(cp, "tls1")) method = TLSv1_client_method(); else { @@ -308,7 +318,7 @@ ssl_check_host(const char *server, struc X509 *cert; X509_NAME *subj; char data[256]; - /*GENERAL_NAMES*/STACK *gens; + GENERAL_NAMES *gens; GENERAL_NAME *gen; int i; @@ -494,7 +504,7 @@ smime_sign(FILE *ip, struct header *head } static int -smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store) +smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store) { struct message *x; char *cp, *sender, *to, *cc, *cnttype; @@ -503,7 +513,8 @@ smime_verify(struct message *m, int n, S off_t size; BIO *fb, *pb; PKCS7 *pkcs7; - STACK *certs, *gens; + STACK_OF(X509) *certs; + GENERAL_NAMES *gens; X509 *cert; X509_NAME *subj; char data[LINESIZE]; @@ -612,7 +623,7 @@ cverify(void *vp) { int *msgvec = vp, *ip; int ec = 0; - STACK *chain = NULL; + STACK_OF(X509) *chain = NULL; X509_STORE *store; char *ca_dir, *ca_file; @@ -685,7 +696,7 @@ smime_encrypt(FILE *ip, const char *cert X509 *cert; PKCS7 *pkcs7; BIO *bb, *yb; - STACK *certs; + STACK_OF(X509) *certs; EVP_CIPHER *cipher; certfile = expand((char *)certfile); @@ -948,9 +959,9 @@ smime_certsave(struct message *m, int n, off_t size; BIO *fb, *pb; PKCS7 *pkcs7; - STACK *certs; + STACK_OF(X509) *certs; X509 *cert; - STACK *chain = NULL; + STACK_OF(X509) *chain = NULL; enum okay ok = OKAY; message_number = n;