casa-mp-base
Public
Source
xxxxxxxxxx--- openssl.c.orig 2016-03-26 22:41:42.000000000 -0400+++ openssl.c 2016-03-26 22:42:04.000000000 -0400@@ -101,12 +101,17 @@ 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);+#ifdef HAVE_STACK_OF+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,+ X509_STORE *store);+#else static int smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store);+#endif static EVP_CIPHER *smime_cipher(const char *name); static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata); static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn);@@ -203,17 +208,15 @@ 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"))- method = SSLv2_client_method();- else if (equal(cp, "ssl3"))+ if (equal(cp, "ssl3")) method = SSLv3_client_method(); else if (equal(cp, "tls1")) method = TLSv1_client_method();@@ -308,7 +311,11 @@ X509 *cert; X509_NAME *subj; char data[256];+#ifdef HAVE_STACK_OF+ STACK_OF(GENERAL_NAME) *gens;+#else /*GENERAL_NAMES*/STACK *gens;+#endif GENERAL_NAME *gen; int i;@@ -357,7 +364,8 @@ ssl_init(); ssl_set_vrfy_level(uhp);- if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) {+ if ((sp->s_ctx =+ SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) { ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed")); return STOP; }@@ -496,7 +504,11 @@ } static int+#ifdef HAVE_STACK_OF+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)+#else smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)+#endif { struct message *x; char *cp, *sender, *to, *cc, *cnttype;@@ -505,7 +517,12 @@ off_t size; BIO *fb, *pb; PKCS7 *pkcs7;+#ifdef HAVE_STACK_OF+ STACK_OF(X509) *certs;+ STACK_OF(GENERAL_NAME) *gens;+#else STACK *certs, *gens;+#endif X509 *cert; X509_NAME *subj; char data[LINESIZE];@@ -614,7 +631,11 @@ {