Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1190)

Unified Diff: webrtc/base/messagedigest.cc

Issue 2640513002: Relanding: Removing #defines previously used for building without BoringSSL/OpenSSL. (Closed)
Patch Set: Rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/helpers.cc ('k') | webrtc/base/openssladapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/messagedigest.cc
diff --git a/webrtc/base/messagedigest.cc b/webrtc/base/messagedigest.cc
index c08cab4ea9db8c4120b89d6b0cdf9caca422c285..5e8621c77064cf2d58b3567853adfad75db5269f 100644
--- a/webrtc/base/messagedigest.cc
+++ b/webrtc/base/messagedigest.cc
@@ -15,13 +15,7 @@
#include <string.h>
#include "webrtc/base/basictypes.h"
-#include "webrtc/base/sslconfig.h"
-#if SSL_USE_OPENSSL
#include "webrtc/base/openssldigest.h"
-#else
-#include "webrtc/base/md5digest.h"
-#include "webrtc/base/sha1digest.h"
-#endif
#include "webrtc/base/stringencode.h"
namespace rtc {
@@ -37,22 +31,12 @@ const char DIGEST_SHA_512[] = "sha-512";
static const size_t kBlockSize = 64; // valid for SHA-256 and down
MessageDigest* MessageDigestFactory::Create(const std::string& alg) {
-#if SSL_USE_OPENSSL
MessageDigest* digest = new OpenSSLDigest(alg);
if (digest->Size() == 0) { // invalid algorithm
delete digest;
digest = NULL;
}
return digest;
-#else
- MessageDigest* digest = NULL;
- if (alg == DIGEST_MD5) {
- digest = new Md5Digest();
- } else if (alg == DIGEST_SHA_1) {
- digest = new Sha1Digest();
- }
- return digest;
-#endif
}
bool IsFips180DigestAlgorithm(const std::string& alg) {
« no previous file with comments | « webrtc/base/helpers.cc ('k') | webrtc/base/openssladapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698