1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- openssl.c.orig 2007-08-04 11:38:03.000000000 +0000
+++ openssl.c 2010-04-04 20:37:40.000000000 +0000
@@ -105,7 +105,7 @@
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 @@
X509 *cert;
X509_NAME *subj;
char data[256];
- /*GENERAL_NAMES*/STACK *gens;
+ /*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES) *gens;
GENERAL_NAME *gen;
int i;
@@ -496,7 +496,7 @@
}
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;
@@ -505,7 +505,8 @@
off_t size;
BIO *fb, *pb;
PKCS7 *pkcs7;
- STACK *certs, *gens;
+ STACK_OF(X509) *certs;
+ STACK_OF(GENERAL_NAMES) *gens;
X509 *cert;
X509_NAME *subj;
char data[LINESIZE];
@@ -614,7 +615,7 @@
{
int *msgvec = vp, *ip;
int ec = 0;
- STACK *chain = NULL;
+ STACK_OF(X509) *chain = NULL;
X509_STORE *store;
char *ca_dir, *ca_file;
@@ -687,7 +688,7 @@
X509 *cert;
PKCS7 *pkcs7;
BIO *bb, *yb;
- STACK *certs;
+ STACK_OF(X509) *certs;
EVP_CIPHER *cipher;
certfile = expand((char *)certfile);
@@ -950,9 +951,9 @@
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;
|
