On Fri, Apr 15, 2011 at 09:23:01AM +0200, Salvatore Bonaccorso wrote:
> > ../libs/comm/cl_ssl_framework.c:238:92: error: type defaults to 'int' in
> > declaration of 'STACK'
> > ../libs/comm/cl_ssl_framework.c:238:98: error: expected ';', ',' or ')'
> > before '*' token
> > ../libs/comm/cl_ssl_framework.c:239:92: error: type defaults to 'int' in
> > declaration of 'STACK'
> > ../libs/comm/cl_ssl_framework.c:239:98: error: expected ';', ',' or ')'
> > before '*' token
Here is a patch that should fix that part. It now fails with:
../daemons/common/pdc.c: In function 'psRetrieveOSJobData':
../daemons/common/pdc.c:2377:14: error: variable 'proccount' set but not used
[-Werror=unused-but-set-variable]
Kurt
--- ./source/libs/comm/cl_ssl_framework.c.old 2011-07-03 15:42:00.000000000 +0200
+++ ./source/libs/comm/cl_ssl_framework.c 2011-07-03 15:56:03.000000000 +0200
@@ -160,8 +160,8 @@
static void (*cl_com_ssl_func__SSL_set_bio) (SSL *s, BIO *rbio,BIO *wbio);
static int (*cl_com_ssl_func__SSL_accept) (SSL *ssl);
static void (*cl_com_ssl_func__SSL_CTX_free) (SSL_CTX *);
-static SSL_CTX* (*cl_com_ssl_func__SSL_CTX_new) (SSL_METHOD *meth);
-static SSL_METHOD* (*cl_com_ssl_func__SSLv23_method) (void);
+static SSL_CTX* (*cl_com_ssl_func__SSL_CTX_new) (const SSL_METHOD *meth);
+static const SSL_METHOD* (*cl_com_ssl_func__SSLv23_method) (void);
static int (*cl_com_ssl_func__SSL_CTX_use_certificate_chain_file) (SSL_CTX *ctx, const char *file);
static int (*cl_com_ssl_func__SSL_CTX_use_certificate) (SSL_CTX *ctx, X509 *cert);
static int (*cl_com_ssl_func__SSL_CTX_use_PrivateKey_file) (SSL_CTX *ctx, const char *file, int type);
@@ -235,16 +235,16 @@
static int (*cl_com_ssl_func__SSL_get_ex_data_X509_STORE_CTX_idx) (void);
static void* (*cl_com_ssl_func__SSL_CTX_get_ex_data) (SSL_CTX *ssl,int idx);
static int (*cl_com_ssl_func__SSL_CTX_set_ex_data) (SSL_CTX *ssl,int idx,void *data);
-static int (*cl_com_ssl_func__sk_num) (const STACK *);
-static char* (*cl_com_ssl_func__sk_value) (const STACK *, int);
+static int (*cl_com_ssl_func__sk_num) (const _STACK *);
+static void* (*cl_com_ssl_func__sk_value) (const _STACK *, int);
static int (*cl_com_ssl_func__X509_STORE_get_by_subject) (X509_STORE_CTX *vs,int type,X509_NAME *name, X509_OBJECT *ret);
static void (*cl_com_ssl_func__EVP_PKEY_free) (EVP_PKEY *pkey);
static void (*cl_com_ssl_func__X509_STORE_CTX_set_error) (X509_STORE_CTX *ctx,int s);
static void (*cl_com_ssl_func__X509_OBJECT_free_contents) (X509_OBJECT *a);
static ASN1_INTEGER* (*cl_com_ssl_func__X509_get_serialNumber) (X509 *x);
-static int (*cl_com_ssl_func__X509_cmp_current_time) (ASN1_TIME *s);
-static int (*cl_com_ssl_func__ASN1_INTEGER_cmp) (ASN1_INTEGER *x, ASN1_INTEGER *y);
-static long (*cl_com_ssl_func__ASN1_INTEGER_get) (ASN1_INTEGER *a);
+static int (*cl_com_ssl_func__X509_cmp_current_time) (const ASN1_TIME *s);
+static int (*cl_com_ssl_func__ASN1_INTEGER_cmp) (const ASN1_INTEGER *x, const ASN1_INTEGER *y);
+static long (*cl_com_ssl_func__ASN1_INTEGER_get) (const ASN1_INTEGER *a);
static int (*cl_com_ssl_func__X509_CRL_verify) (X509_CRL *a, EVP_PKEY *r);
static EVP_PKEY* (*cl_com_ssl_func__X509_get_pubkey) (X509 *x);
static int (*cl_com_ssl_func__X509_STORE_set_default_paths) (X509_STORE *ctx);
@@ -1203,14 +1203,14 @@
}
func_name = "SSL_CTX_new";
- cl_com_ssl_func__SSL_CTX_new = (SSL_CTX* (*)(SSL_METHOD *meth))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__SSL_CTX_new = (SSL_CTX* (*)(const SSL_METHOD *meth))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__SSL_CTX_new == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "SSLv23_method";
- cl_com_ssl_func__SSLv23_method = (SSL_METHOD* (*)(void))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__SSLv23_method = (const SSL_METHOD* (*)(void))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__SSLv23_method == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
@@ -1700,14 +1700,14 @@
}
func_name = "sk_num";
- cl_com_ssl_func__sk_num = (int (*)(const STACK *))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__sk_num = (int (*)(const _STACK *))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__sk_num == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "sk_value";
- cl_com_ssl_func__sk_value = (char* (*)(const STACK *, int))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__sk_value = (void* (*)(const _STACK *, int))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__sk_value == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
@@ -1749,21 +1749,21 @@
}
func_name = "X509_cmp_current_time";
- cl_com_ssl_func__X509_cmp_current_time = (int (*)(ASN1_TIME *s))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__X509_cmp_current_time = (int (*)(const ASN1_TIME *s))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__X509_cmp_current_time == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "ASN1_INTEGER_cmp";
- cl_com_ssl_func__ASN1_INTEGER_cmp = (int (*)(ASN1_INTEGER *x, ASN1_INTEGER *y))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__ASN1_INTEGER_cmp = (int (*)(const ASN1_INTEGER *x, const ASN1_INTEGER *y))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__ASN1_INTEGER_cmp == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "ASN1_INTEGER_get";
- cl_com_ssl_func__ASN1_INTEGER_get = (long (*)(ASN1_INTEGER *a))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__ASN1_INTEGER_get = (long (*)(const ASN1_INTEGER *a))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__ASN1_INTEGER_get == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
