72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
|
Index: mailx-12.2/openssl.c
|
||
|
|
===================================================================
|
||
|
|
--- mailx-12.2.orig/openssl.c
|
||
|
|
+++ mailx-12.2/openssl.c
|
||
|
|
@@ -105,7 +105,7 @@ static SSL_METHOD *ssl_select_method(con
|
||
|
|
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);
|
||
|
|
@@ -308,7 +308,7 @@ ssl_check_host(const char *server, struc
|
||
|
|
X509 *cert;
|
||
|
|
X509_NAME *subj;
|
||
|
|
char data[256];
|
||
|
|
- /*GENERAL_NAMES*/STACK *gens;
|
||
|
|
+ STACK_OF(GENERAL_NAME) *gens;
|
||
|
|
GENERAL_NAME *gen;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
@@ -494,7 +494,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 +503,8 @@ smime_verify(struct message *m, int n, S
|
||
|
|
off_t size;
|
||
|
|
BIO *fb, *pb;
|
||
|
|
PKCS7 *pkcs7;
|
||
|
|
- STACK *certs, *gens;
|
||
|
|
+ STACK_OF(X509) *certs;
|
||
|
|
+ STACK_OF(GENERAL_NAME) *gens;
|
||
|
|
X509 *cert;
|
||
|
|
X509_NAME *subj;
|
||
|
|
char data[LINESIZE];
|
||
|
|
@@ -612,7 +613,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 +686,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 +949,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;
|