diff options
author | Brian Carlstrom <bdc@google.com> | 2010-06-22 23:43:20 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2010-06-26 11:36:33 -0700 |
commit | 12cd1f00c2fa1a7f37bf644cecdf7588bdc0b0a9 (patch) | |
tree | 30b0a7b661f472721e9daab349d93ae835901923 /support | |
parent | 6f39ada8cbbc0823f8e8c91e8f3cbfb78d7df114 (diff) | |
download | libcore-12cd1f00c2fa1a7f37bf644cecdf7588bdc0b0a9.zip libcore-12cd1f00c2fa1a7f37bf644cecdf7588bdc0b0a9.tar.gz libcore-12cd1f00c2fa1a7f37bf644cecdf7588bdc0b0a9.tar.bz2 |
Remove libcore's dependency on bouncycastle
external/bouncycastle
- Change to be the primary build for bouncycastle sources (as opposed to part of libcore)
- Moved OpenSSLMessageDigest from libcore to OpenSSLDigest
It uses NativeCrypto API from core, but implements a bouncycastle specific interface
- restored registration of bouncycastle MessageDigests for SHA-1, SHA-256, MD5
OpenSSLProvider versions take precedence, but explicit provider of "BC" allows choice
- enabled native versions of SHA-384 and SHA-512
- pruned MD4 implementation
frameworks/base
- frameworks and CoreTests modules now depend on bouncycastle
- update preloades classes for NativeBN package change
- moved CryptoTest to libcore
libcore
- core now builds without bouncycastle sources
- core-tests, core-tests-support, core-tests-supportlib now depend on bouncycastle
- removed libcore/openssl directory, moving NativeBN to java/math
- minor cleanup of Provider, Security, Services style while working on ProviderTest
- added new OpenSSLProvider registered as first provider to have
priority over the others to ensure our native implementations are used
- moved BouncyCastle to have priority as a provider over Harmony
- JarVerifier and JarUtils now implicitly use OpenSSLMessageDigest
- Cleanedup OpenSSLSignature, implementation needs to be finished to move to OpenSSLProvider
- To avoid using PEMWriter from BouncyCastle, NativeCrypto now takes binary encoded certs and keys
This is more efficient as well avoiding the base64 decode/encode of the binary data
- removed SHA-224 to match the RI
packages/apps/CertInstaller
- CertificateInstaller module now depends on bouncycastle
this is the only app to depend on bouncycastle
system/core
- updated BOOTCLASSPATH
Change-Id: I6205366b12baec4331b4a76e2c85d8324bf64b2c
Diffstat (limited to 'support')
-rw-r--r-- | support/src/test/java/java/security/StandardNames.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/support/src/test/java/java/security/StandardNames.java b/support/src/test/java/java/security/StandardNames.java index 316b46e..ec34eda 100644 --- a/support/src/test/java/java/security/StandardNames.java +++ b/support/src/test/java/java/security/StandardNames.java @@ -263,7 +263,7 @@ public final class StandardNames extends Assert { unprovide("KeyManagerFactory", "SunX509"); provide("KeyManagerFactory", "X509"); - // different names SHA vs SHA-1 + // different names: BouncyCastle actually uses the Standard name of SHA-1 vs SHA unprovide("MessageDigest", "SHA"); provide("MessageDigest", "SHA-1"); @@ -287,10 +287,6 @@ public final class StandardNames extends Assert { // TODO remove one, probably Harmony's provide("CertificateFactory", "X509"); - // The Harmony JSSEProvider registers an OpenSSL based MessageDigest SHA-224 - // TODO remove it since the RI does not provide this variant - provide("MessageDigest", "SHA-224"); - // Harmony JSSEProvider is missing these // TODO add them unprovide("SSLContext", "SSLv3"); |