=== 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