summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 23:18:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 23:18:18 +0000
commit996856a1c8a7c7871c81797dc621a4659213d80c (patch)
treea19f5f1a4f62a7d200e985a8d574e4319cc5d888 /net/http
parentcf8508be64153d78f4aa5883c6221c0a3335fb2c (diff)
downloadchromium_src-996856a1c8a7c7871c81797dc621a4659213d80c.zip
chromium_src-996856a1c8a7c7871c81797dc621a4659213d80c.tar.gz
chromium_src-996856a1c8a7c7871c81797dc621a4659213d80c.tar.bz2
Revert "Switch to BoringSSL."
This reverts commit r284079. BUG=395271 Review URL: https://codereview.chromium.org/406693004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/des.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/des.cc b/net/http/des.cc
index daac8a4..79240cf 100644
--- a/net/http/des.cc
+++ b/net/http/des.cc
@@ -93,10 +93,10 @@ void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) {
crypto::EnsureOpenSSLInit();
DES_key_schedule ks;
- DES_set_key(
- reinterpret_cast<const DES_cblock*>(key), &ks);
+ DES_set_key_unchecked(
+ reinterpret_cast<const_DES_cblock*>(const_cast<uint8*>(key)), &ks);
- DES_ecb_encrypt(reinterpret_cast<const DES_cblock*>(src),
+ DES_ecb_encrypt(reinterpret_cast<const_DES_cblock*>(const_cast<uint8*>(src)),
reinterpret_cast<DES_cblock*>(hash), &ks, DES_ENCRYPT);
}