@@ -69,9 +69,6 @@

 #if SSLEAY_VERSION_NUMBER < 0x00907000L

-/* Workaround: OpenSSL 0.9.6 breaks extract_x509_field_ssl function */

-#define USE_OLD_EXTRACT_X509_FIELD

-

 /* Workaround: EVP_CIPHER_mode is defined wrong in OpenSSL 0.9.6 but is fixed in 0.9.7 */

 #undef EVP_CIPHER_mode

 #define EVP_CIPHER_mode(e)                (((e)->flags) & EVP_CIPH_MODE)

@@ -358,8 +358,8 @@ extract_x509_field_ssl (X509_NAME *x509, const char *field_name, char *out, int

   int tmp = -1;

   X509_NAME_ENTRY *x509ne = 0;

   ASN1_STRING *asn1 = 0;

-  unsigned char *buf = 0;

-  int nid = OBJ_txt2nid(field_name);

+  unsigned char *buf = (unsigned char *)1; /* bug in OpenSSL 0.9.6b ASN1_STRING_to_UTF8 requires this workaround */

+  int nid = OBJ_txt2nid((char *)field_name);

   ASSERT (size > 0);

   *out = '\0';