Index: net/cert/internal/verify_signed_data.cc |
diff --git a/net/cert/internal/verify_signed_data.cc b/net/cert/internal/verify_signed_data.cc |
index eb0fd3ff2b6380e04d5eac1d5b3cd990425e768d..fe6aae80d949a4cf058fac2ebd8e6db3d92965c1 100644 |
--- a/net/cert/internal/verify_signed_data.cc |
+++ b/net/cert/internal/verify_signed_data.cc |
@@ -4,31 +4,6 @@ |
#include "net/cert/internal/verify_signed_data.h" |
-#include "base/logging.h" |
-#include "net/der/parse_values.h" |
- |
-// TODO(eroman): There is no intention to implement this for non-OpenSSL. Remove |
-// this branch once the migration is complete. This could have been done as a |
-// conditional file (_openssl.cc) in the build file instead, but that is likely |
-// not worth the effort at this point. |
- |
-#if !defined(USE_OPENSSL) |
- |
-namespace net { |
- |
-bool VerifySignedData(const SignatureAlgorithm& signature_algorithm, |
- const der::Input& signed_data, |
- const der::BitString& signature_value, |
- const der::Input& public_key, |
- const SignaturePolicy* policy) { |
- NOTIMPLEMENTED(); |
- return false; |
-} |
- |
-} // namespace net |
- |
-#else |
- |
#include <openssl/bytestring.h> |
#include <openssl/digest.h> |
#include <openssl/ec.h> |
@@ -37,11 +12,13 @@ bool VerifySignedData(const SignatureAlgorithm& signature_algorithm, |
#include <openssl/rsa.h> |
#include "base/compiler_specific.h" |
+#include "base/logging.h" |
#include "crypto/openssl_util.h" |
#include "crypto/scoped_openssl_types.h" |
#include "net/cert/internal/signature_algorithm.h" |
#include "net/cert/internal/signature_policy.h" |
#include "net/der/input.h" |
+#include "net/der/parse_values.h" |
#include "net/der/parser.h" |
namespace net { |
@@ -312,5 +289,3 @@ bool VerifySignedData(const SignatureAlgorithm& signature_algorithm, |
} |
} // namespace net |
- |
-#endif |