Re: squid + sslbump compile errors

[Henrik Nordström <henrik@xxxxxxxxxxxxxxxxxxx>]

sön 2012-02-05 klockan 14:09 -0600 skrev James R. Leu:

> I get the following errors:
> 
> ufs/store_dir_ufs.cc: In member function 'virtual void UFSSwapDir::statfs(StoreEntry&) const':
> ufs/store_dir_ufs.cc:321:55: error: unable to find string literal operator 'operator"" PRIu64'

What compiler and operating system are you compiling Squid on?


> I was able to 'resolve' the above by using %jd instead
> of the "PRIu64"

%jd? Should be %lld

and compat/types.h should automatically define it as suitable if not
defined by the compiler headers.

> certificate_db.cc: In member function ‘void Ssl::CertificateDb::load()’:
> certificate_db.cc:455:1: error: ‘index_serial_hash_LHASH_HASH’ was not declared in this scope

Hm.. fails for me as well. Please try the attached patch.

Regards
Henrik

=== modified file 'src/ssl/certificate_db.cc'
--- src/ssl/certificate_db.cc	2012-01-20 18:55:04 +0000
+++ src/ssl/certificate_db.cc	2012-02-05 23:35:46 +0000
@@ -445,7 +445,7 @@
         corrupt = true;
 
     // Create indexes in db.
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
     if (!corrupt && !TXT_DB_create_index(temp_db.get(), cnlSerial, NULL, LHASH_HASH_FN(index_serial), LHASH_COMP_FN(index_serial)))
         corrupt = true;
 
@@ -484,7 +484,7 @@
 void Ssl::CertificateDb::deleteRow(const char **row, int rowIndex)
 {
     const std::string filename(cert_full + "/" + row[cnlSerial] + ".pem");
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
     sk_OPENSSL_PSTRING_delete(db.get()->data, rowIndex);
 #else
     sk_delete(db.get()->data, rowIndex);
@@ -492,7 +492,7 @@
 
     const Columns db_indexes[]={cnlSerial, cnlName};
     for (unsigned int i = 0; i < countof(db_indexes); i++) {
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
         if (LHASH_OF(OPENSSL_STRING) *fieldIndex =  db.get()->index[db_indexes[i]])
             lh_OPENSSL_STRING_delete(fieldIndex, (char **)row);
 #else
@@ -513,7 +513,7 @@
         return false;
 
     bool removed_one = false;
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
     for (int i = 0; i < sk_OPENSSL_PSTRING_num(db.get()->data); i++) {
         const char ** current_row = ((const char **)sk_OPENSSL_PSTRING_value(db.get()->data, i));
 #else
@@ -538,14 +538,14 @@
     if (!db)
         return false;
 
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
     if (sk_OPENSSL_PSTRING_num(db.get()->data) == 0)
 #else
     if (sk_num(db.get()->data) == 0)
 #endif
         return false;
 
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
     const char **row = (const char **)sk_OPENSSL_PSTRING_value(db.get()->data, 0);
 #else
     const char **row = (const char **)sk_value(db.get()->data, 0);
@@ -561,7 +561,7 @@
     if (!db)
         return false;
 
-#if OPENSSL_VERSION_NUMBER >= 0x1000004fL
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
     for (int i = 0; i < sk_OPENSSL_PSTRING_num(db.get()->data); i++) {
         const char ** current_row = ((const char **)sk_OPENSSL_PSTRING_value(db.get()->data, i));
 #else