Browse Source

support 0.9.7 too

David Rose 16 years ago
parent
commit
9b35958d4c
1 changed files with 3 additions and 1 deletions
  1. 3 1
      panda/src/express/multifile.cxx

+ 3 - 1
panda/src/express/multifile.cxx

@@ -2355,9 +2355,11 @@ check_signatures() {
     CertChain chain;
     CertChain chain;
     EVP_PKEY *pkey = NULL;
     EVP_PKEY *pkey = NULL;
     if (!buffer.empty()) {
     if (!buffer.empty()) {
-#ifdef OPENSSL_097
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L
+      // Beginning in 0.9.8, d2i_X509() accepted a const unsigned char **.
       const unsigned char *bp, *bp_end;
       const unsigned char *bp, *bp_end;
 #else
 #else
+      // Prior to 0.9.8, d2i_X509() accepted an unsigned char **.
       unsigned char *bp, *bp_end;
       unsigned char *bp, *bp_end;
 #endif
 #endif
       bp = (unsigned char *)&buffer[0];
       bp = (unsigned char *)&buffer[0];