fixed compilation warnings and errors when not using curl
authorMartin Willi <martin@strongswan.org>
Tue, 13 Mar 2007 14:52:18 +0000 (14:52 -0000)
committerMartin Willi <martin@strongswan.org>
Tue, 13 Mar 2007 14:52:18 +0000 (14:52 -0000)
src/libstrongswan/Makefile.am
src/libstrongswan/crypto/ca.c
src/libstrongswan/crypto/ocsp.c
src/libstrongswan/utils/fetcher.c
src/libstrongswan/utils/leak_detective.c

index 3c1a913..0236ba3 100644 (file)
@@ -54,6 +54,10 @@ if USE_LEAK_DETECTIVE
   AM_CFLAGS = -DLEAK_DETECTIVE
 endif
 
   AM_CFLAGS = -DLEAK_DETECTIVE
 endif
 
+if USE_LIBCURL
+  libstrongswan_la_LIBADD += -lcurl
+endif
+
 asn1/oid.c :   asn1/oid.txt asn1/oid.pl
                cd asn1 && $(PERL) oid.pl
 
 asn1/oid.c :   asn1/oid.txt asn1/oid.pl
                cd asn1 && $(PERL) oid.pl
 
index e9ccbfd..1e930a4 100644 (file)
@@ -456,7 +456,6 @@ static int print(FILE *stream, const struct printf_info *info,
        bool utc = TRUE;
        int written = 0;
        const x509_t *cacert;
        bool utc = TRUE;
        int written = 0;
        const x509_t *cacert;
-       chunk_t keyid;
        
        if (info->alt)
        {
        
        if (info->alt)
        {
index 6f21aa8..cc4910e 100644 (file)
@@ -467,7 +467,6 @@ static bool ocsp_parse_basic_response(chunk_t blob, int level0, response_t *res)
 {
        u_int level, version;
        u_int extn_oid = OID_UNKNOWN;
 {
        u_int level, version;
        u_int extn_oid = OID_UNKNOWN;
-       u_char buf[BUF_LEN];
        asn1_ctx_t ctx;
        bool critical;
        chunk_t object;
        asn1_ctx_t ctx;
        bool critical;
        chunk_t object;
index b14ba16..30154f8 100644 (file)
@@ -137,7 +137,9 @@ static chunk_t post(private_fetcher_t *this, const char *request_type, chunk_t r
  */
 static void destroy(private_fetcher_t *this)
 {
  */
 static void destroy(private_fetcher_t *this)
 {
+#ifdef LIBCURL
        curl_easy_cleanup(this->curl);
        curl_easy_cleanup(this->curl);
+#endif /* LIBCURL */
        free(this);
 }
 
        free(this);
 }
 
index 3f564b0..b8a0232 100644 (file)
@@ -176,8 +176,9 @@ struct whitelist_t {
 };
 
 #ifdef LIBCURL
 };
 
 #ifdef LIBCURL
+/* dummy declaration for whitelisting */
 void *Curl_getaddrinfo(void);
 void *Curl_getaddrinfo(void);
-#endif
+#endif /* LIBCURL */
 
 whitelist_t whitelist[] = {
        {pthread_create,                        2542},
 
 whitelist_t whitelist[] = {
        {pthread_create,                        2542},
@@ -191,8 +192,10 @@ whitelist_t whitelist[] = {
        {register_printf_function,       159},
        {syslog,                                          45},
        {dlopen,                                         109},
        {register_printf_function,       159},
        {syslog,                                          45},
        {dlopen,                                         109},
+#      ifdef LIBCURL
        /* from /usr/lib/libcurl.so.3 */
        {Curl_getaddrinfo,                       480},
        /* from /usr/lib/libcurl.so.3 */
        {Curl_getaddrinfo,                       480},
+#      endif /* LIBCURL */
 };
 
 /**
 };
 
 /**