Browse Source

downloader: Use built-in MD5 implemention for HTTPDigestAuthorization

This code is only compiled when OpenSSL is enabled at the moment, but this will change when webgl-port is merged
rdb 2 years ago
parent
commit
b3730bf707
1 changed files with 6 additions and 17 deletions
  1. 6 17
      panda/src/downloader/httpDigestAuthorization.cxx

+ 6 - 17
panda/src/downloader/httpDigestAuthorization.cxx

@@ -15,11 +15,10 @@
 
 #ifdef HAVE_OPENSSL
 
-#include "httpChannel.h"
+#include "hashVal.h"
 #include "string_utils.h"
-#include "openSSLWrapper.h"  // must be included before any other openssl.
-#include <openssl/ssl.h>
-#include <openssl/md5.h>
+#include "urlSpec.h"
+
 #include <time.h>
 
 using std::ostream;
@@ -292,19 +291,9 @@ get_hex_nonce_count() const {
  */
 string HTTPDigestAuthorization::
 calc_md5(const string &source) {
-  unsigned char binary[MD5_DIGEST_LENGTH];
-
-  MD5((const unsigned char *)source.data(), source.length(), binary);
-
-  string result;
-  result.reserve(MD5_DIGEST_LENGTH * 2);
-
-  for (int i = 0; i < MD5_DIGEST_LENGTH; i++) {
-    result += hexdigit((binary[i] >> 4) & 0xf);
-    result += hexdigit(binary[i] & 0xf);
-  }
-
-  return result;
+  HashVal hv;
+  hv.hash_string(source);
+  return hv.as_hex();
 }
 
 ostream &