Skip to content

Commit

Permalink
Fold away sha256_legacy_support_{nss,openssl}_win.cc
Browse files Browse the repository at this point in the history
Windows may assume use_openssl is set. (Also remove some unnecessary clauses in
net/BUILD.gn as mac and even use_nss_certs also imply use_openssl now.)

BUG=519504

Review URL: https://codereview.chromium.org/1365433003

Cr-Commit-Position: refs/heads/master@{#350738}
  • Loading branch information
davidben authored and Commit bot committed Sep 25, 2015
1 parent 6127bb6 commit de638a6
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 314 deletions.
22 changes: 0 additions & 22 deletions net/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ if (!is_nacl) {
"cert/cert_verify_proc_nss.h",
]
}
if (is_win) {
net_shared_sources -= [ "cert/sha256_legacy_support_nss_win.cc" ]
}
if (!use_nss_certs && !is_ios) {
net_shared_sources -= [ "cert/x509_util_nss.h" ]
}
Expand Down Expand Up @@ -218,25 +215,6 @@ if (!is_nacl) {
"ssl/threaded_ssl_private_key.cc",
"ssl/threaded_ssl_private_key.h",
]
if (is_mac) {
net_shared_sources -= [ "ssl/ssl_platform_key_mac.cc" ]
}
if (is_android) {
net_shared_sources -= [ "ssl/ssl_platform_key_android.cc" ]
}
if (is_win) {
net_shared_sources -= [
"cert/sha256_legacy_support_openssl_win.cc",
"ssl/ssl_platform_key_win.cc",
]
}
if (use_nss_certs) {
net_shared_sources -= [
"ssl/client_key_store.cc",
"ssl/client_key_store.h",
"ssl/ssl_platform_key_nss.cc",
]
}
}

if (!use_openssl_certs) {
Expand Down
118 changes: 0 additions & 118 deletions net/cert/sha256_legacy_support_nss_win.cc

This file was deleted.

153 changes: 0 additions & 153 deletions net/cert/sha256_legacy_support_openssl_win.cc

This file was deleted.

Loading

0 comments on commit de638a6

Please sign in to comment.