Browse Source

Drop support for OpenSSL versions before 0.9.7

rdb 9 years ago
parent
commit
06cc1794fc
2 changed files with 1 additions and 19 deletions
  1. 0 8
      dtool/src/prc/configPage.cxx
  2. 1 11
      dtool/src/prckeys/signPrcFile_src.cxx

+ 0 - 8
dtool/src/prc/configPage.cxx

@@ -129,11 +129,7 @@ read_prc(istream &in) {
 
 #ifdef HAVE_OPENSSL
   // Set up the evp context for verifying the signature, if we find one.
-#ifdef SSL_097
   _md_ctx = EVP_MD_CTX_create();
-#else
-  _md_ctx = new EVP_MD_CTX;
-#endif
   EVP_VerifyInit((EVP_MD_CTX *)_md_ctx, EVP_sha1());
 #endif  // HAVE_OPENSSL
 
@@ -208,11 +204,7 @@ read_prc(istream &in) {
         << "invalid signature found in " << get_name() << "\n";
     }
   }
-#ifdef SSL_097
   EVP_MD_CTX_destroy((EVP_MD_CTX *)_md_ctx);
-#else
-  delete (EVP_MD_CTX *)_md_ctx;
-#endif
 #endif  // HAVE_OPENSSL
 
   bool failed = (in.fail() && !in.eof());

+ 1 - 11
dtool/src/prckeys/signPrcFile_src.cxx

@@ -179,13 +179,7 @@ sign_prc(Filename filename, bool no_comments, EVP_PKEY *pkey) {
   }
   data += strm.str();
 
-  EVP_MD_CTX *md_ctx;
-
-#ifdef SSL_097
-  md_ctx = EVP_MD_CTX_create();
-#else
-  md_ctx = new EVP_MD_CTX;
-#endif
+  EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
 
   EVP_SignInit(md_ctx, EVP_sha1());
   EVP_SignUpdate(md_ctx, data.data(), data.size());
@@ -199,11 +193,7 @@ sign_prc(Filename filename, bool no_comments, EVP_PKEY *pkey) {
   }
   assert(sig_size <= max_size);
 
-#ifdef SSL_097
   EVP_MD_CTX_destroy(md_ctx);
-#else
-  delete md_ctx;
-#endif
 
   // Now open the file in write mode and rewrite it with the new signature.
   pofstream out;