| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
Bug: 154796679
Test: m stable.art.module.platform.api.stubs.source-update-current-api
Test: m update-api
Change-Id: Ida9b1065a1a6c172f8a862e1fe2d55085c56398b
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added a test to verify none of the removed algorithms can't actually be
retrieved, since commenting out upstream code is error prone.
KeyFactory.RSA is still deprecated and not removed since it is in use by
verity.
Bug: 67761667
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Test: cts -m CtsLibcoreWycheproofBCTestCases
Test: cts -m CtsLibcoreWycheproofConscryptTestCases
Change-Id: I983b5eeae19eca4404d68ea94765e80a85c35df7
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Revert "Remove deprecated BouncyCastle algorithms"
Revert "Remove deprecated BouncyCastle algorithms"
Revert submission 1299358-remove_bc_algos
Reason for revert: broke higkey-userdebug
Bug: 155693016
Reverted Changes:
I98adb4d2f:Load default KeyFactory instead of BC's implementa...
I5256fe1c7:Remove deprecated BouncyCastle algorithms
I0437de742:Remove deprecated BouncyCastle algorithms
Ie9e0cfa02:Remove deprecated BouncyCastle algorithms
Change-Id: I86d770df93ad7440ca7c774e118c709ad50d35e7
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added a test to verify none of the removed algorithms can't actually be
retrieved, since commenting out upstream code is error prone.
Leaving BC deprecation in place since there are more overlapping
implementations (with Conscrypt) that we might want to remove.
Bug: 67761667
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Test: cts -m CtsLibcoreWycheproofBCTestCases
Test: cts -m CtsLibcoreWycheproofConscryptTestCases
Change-Id: Ie9e0cfa02ed14061a8d500b7412199d401a690df
|
| |
|
|
|
|
|
|
| |
This reverts commit 44ab8eefe6bda0c876437c3aa84d2ed2b809e877.
Reason for revert: b/141855735
Change-Id: Idd702b1ba0ff4bbb3300848d4431873528a8cea0
|
| |
|
|
|
|
|
|
| |
This should be reverted once extra quota is granted.
Bug: 141855735
Test: none
Change-Id: I4d9369d1befbb1f2c34e041829b6613536fb168e
|
| |
|
|
|
|
|
|
|
| |
This adds package-level mappings for libcore.*, sun.*, android.system,
dalvik.system, and org.json.
Test: treehugger
Bug: 130283485
Change-Id: I4f82d1fe316d4d0ac76951c43bdc08c69336a252
|
| |
|
|
|
|
|
|
|
| |
When this code was written, API level 27 wasn't public, so the limit
was set at 26. Update it to 27 now that it's public.
Test: cts -m CtsLibcoreTestCases
Bug: 74612138
Change-Id: I3f1d17aa6cba30658db3d016a9dc74639c97f8a2
|
| |
|
|
|
| |
Test: Visual inspection
Change-Id: I9d2a4b7873e95284877d8495e9e51fa2c901963a
|
| |
|
|
|
|
| |
Test: make
Bug: 67626877
Change-Id: I81503110cdcb36845b3671df6662582caaafce9b
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The ultimate removal of these algorithms, once a sufficient deprecation
period has elapsed, is tracked in b/67761667.
Bug: 67626877
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Test: cts -m CtsLibcoreWycheproofBCTestCases
Test: cts -m CtsLibcoreWycheproofConscryptTestCases
Change-Id: Ib59e74adaadb8bd120f328501528a10b17031a6b
|
| |
|
|
|
|
|
|
|
| |
Add a bunch of change markers in PKCS7 and fix a needless diff from
upstream in JCAUtil.
Test: make
Bug: 62015290
Change-Id: Ief66a93104b5b33b7205077249c0d71beb3cdaa9
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The first step in deprecating the BC implementations of algorithms that
are also provided by Conscrypt. This checks whether the app's target
API level is greater than a given threshold (currently O, but subject
to change later) and disallows access to those algorithms when true.
This limit only applies to requests from the system-created BC provider.
Apps can install their own provider, in which case they get the
implementations they requested.
This doesn't yet implement the deprecation for Cipher instances, since
the transformation scheme makes that more complicated.
The ultimate removal of these algorithms, once a sufficient deprecation
period has elapsed, is tracked in b/67761667.
Bug: 67626877
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Test: cts -m CtsLibcoreWycheproofBCTestCases
Test: cts -m CtsLibcoreWycheproofConscryptTestCases
Change-Id: I48f07226e66873a65859121af32028c1547952ac
|
| |
|
|
|
|
|
|
|
| |
Also revert some unneeded upstream diffs in Debug, which makes the file
track the upstream much more closely but doesn't change any behavior.
Bug: 62015290
Test: make
Change-Id: I7358d08eda7782e3b5486f1e5da591af515b5acb
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Contains patches:
changeset: 12109:8d36d0b503ba
user: robm
date: Wed Sep 07 17:01:56 2016 +0100
summary: 8139565: Restrict certificates with DSA keys less than 1024 bits
(Which makes a DSAKey related android-changed section obsolete)
changeset: 11326:ab54163c8610
tag: jdk8u71-b03
user: igerasim
date: Fri Oct 09 12:53:49 2015 +0300
summary: 8134605: Partial rework of the fix for 8081297
changeset: 11317:3e9d6880f36f
parent: 11310:28d077e97ce2
parent: 11316:b6bab84eac43
user: asaha
date: Fri Sep 18 08:41:55 2015 -0700
summary: Merge
changeset: 11188:7eb9c6cf007c
tag: jdk8u65-b12
user: asaha
date: Mon Aug 31 13:30:33 2015 -0700
summary: 8134774: Need to backout partial fix for 8081297 from 9, 8u65, 8u66, 7u91
changeset: 11130:fe1c420a8982
tag: jdk8u65-b05
user: igerasim
date: Sat Jul 11 14:59:58 2015 +0300
summary: 8081297: SSL Problem with Tomcat
Test: make
Bug: 36461944
Change-Id: I585fac3c29d39f293e510bee52faa0680769a436
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This CL consists of an automated and a manual part (originally
reviewed as separate CLs, then squashed together before submitting
in order to minimize the number of times each Android-changed line
is touch, since that makes future git archaeology on these simpler).
Automated part: Run the following command (performs regex replacements):
find ojluni -name \*\.java | xargs sed -i \
-e 's/Android[- ]changed/Android-changed/ig' \
-e 's/Android-changed :/Android-changed:/g' \
-e 's/Android-changed \(BEGIN\|END\)/\1 Android-changed/g' \
-e 's/Android-changed - /Android-changed: /g' \
-e 's/Android[- ]removed/Android-removed/ig' \
-e 's/Android-removed :/Android-removed:/g' \
-e 's/Android-removed \(BEGIN\|END\)/\1 Android-removed/g' \
-e 's/Android-removed - /Android-removed: /g' \
-e 's/Android[- ]added/Android-added/ig' \
-e 's/Android-added :/Android-added:/g' \
-e 's/Android-added \(BEGIN\|END\)/\1 Android-added/g' \
-e 's/Android-added - /Android-added: /g' \
-e 's/----- \(BEGIN\|END\) android\( -----\)\?/\1 Android-changed/g' \
-e 's/\/\* \(BEGIN\|END\) Android-changed \*\//\/\/ \1 Android-changed/g'
Manual part: Move BEGIN Android-* lines out of block comments
Some Android-{changed,removed,added} lines occurred inside block comments.
This CL targets places in ojluni that contained the String "* BEGIN Android-"
Changes made by this CL include:
- Move the "BEGIN Android-" line into a line comment (the style guide
mandates that "Android-" lines are always in line comments). In many
cases, that line comment is immediately followed by a block comment
holding commented-out upstream code.
- Add corresponding "// END Android-" line comments, where missing.
- Drop documented import changes altogether. These create noise for
little benefit:
(1.) Most import problems will be found at compile time
(2.) They generally correspond to documented changes elsewhere in
the file.
- In most cases, the phrasing of comments and the decision whether to
keep commented out upstream code was not changed by this CL.
- Some additional tweaks were made in line with the style guide.
No attempt was made to:
- Verify that commented-out upstream code actually matches the
current upstream.
- Make any fixes (eg. to comments) that would have required
git archaeology (looking up historic commits).
Bug: 35841464
Test: make droid cts update-api
Change-Id: Ibc60979cb6061cfb0e9c7096cc9dcab30ddfa733
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
As of jdk8u60, a serialVersionUID was added to this class.
Note, the number doesn't coincide with the default as computed by
Android (but it does wrt the RI). Using the one in the code from the
OpenJDK for now, and adding a TODO for that separate issue.
Bug: 29631070
Bug: 33172161
Test: make droid
Change-Id: I7f8b609200a6b5630ce9e3f75b44964573b4b68f
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pulling upstream changes from OpenJDK version jdk8u60 for classes
in sun.security.jca
This commit contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags.
- Tidied up casts/generics.
- Removal of unnecessary imports.
Note: ProviderList includes more significant changes and will
be updated in a following CL.
Change-Id: Ie75fb2244c81a561297e4a6eb62695193d89411b
Test: make droid docs
Bug: 29631070
|
| |
|
|
|
|
|
| |
java file does not need x attribute. This patch removes it.
Change-Id: I2a7170d99f4bee7a7b819621c84dd197ded37fa2
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
|
| |
|
|
|
|
|
|
|
|
| |
Also change ProviderConfig to try loading providers on the boot
classpath before attempting the System class loader. This lets us
initialize things at compile time.
bug: 27805718
Change-Id: I4f33c752c0cb1e96f5b8c863fc32413cc8ec7fa0
|
| |
|
|
| |
Change-Id: I8149f41585768a1a4b72ab7bb4a1452376c05cc2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Removed org.apache.harmony.security.* files from
non-OpenJdk whitelist.
- Removed the package providers from relevant registrations
- Created java tests blacklist, added all tests that
depend on org.apache.harmony.security package (they
may require rewriting in the future)
- Extended sun.security.pkcs.PKCS7|SignerInfo to work
with data provided as InputStream. This is required
for the android.os.RecoverySystem.
Change-Id: Ib5162afef78a85a52bbba3a246e49d03037146c8
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Includes:
- java.util.jar
- java.security
- java.security.acl,
- java.security.cert
- java.security.interfaces
- java.security.spec
Preserve StrictJarFile (and supporting classes) which confirms to a
stronger spec than java.util.jar.*
- StrictJarFileTest#testGetManifest has been temporarily suppressed.
- Several security related methods are no-ops now.
- Read security.properties from the library jar file (and not the FS).
- Security.initializeStatics uses the following providers (in order):
(a) conscrypt
(b) bouncycastle
(c) harmony's crypto provider.
(d) conscrypt (JSSE).
Change-Id: I24d3d68b033d00293c3e450429d31cb8ce50a44b
|
|
|
Create new libcore/ojluni directory with src/main/java and
src/main/native subdirectiories.
Build ojluni into core-oj jar.
Use openjdk classes from java.awt.font package.
Copy all files from jdk/src/share/classes and jdk/src/solaris/classes
directories in openjdk into libcore/ojluni/src/main/java.
Copy following native files from openjdk to
libcore/ojluni/src/main/native:
jdk/src/solaris/native/java/io/canonicalize_md.c
build/linux-amd64/include/classfile_constants.h
jdk/src/share/native/java/net/DatagramPacket.c
jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
jdk/src/share/native/java/lang/Double.c
jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
jdk/src/solaris/native/java/io/FileDescriptor_md.c
jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
jdk/src/share/native/java/io/FileInputStream.c
jdk/src/solaris/native/sun/nio/ch/FileKey.c
jdk/src/solaris/native/java/io/FileOutputStream_md.c
jdk/src/solaris/native/java/io/FileSystem_md.c
jdk/src/share/native/java/lang/Float.c
jdk/src/share/native/java/net/Inet4Address.c
jdk/src/solaris/native/java/net/Inet4AddressImpl.c
jdk/src/share/native/java/net/Inet6Address.c
jdk/src/solaris/native/java/net/Inet6AddressImpl.c
jdk/src/share/native/java/net/InetAddress.c
jdk/src/solaris/native/java/net/InetAddressImplFactory.c
jdk/src/share/native/java/io/io_util.c
jdk/src/solaris/native/sun/nio/ch/IOUtil.c
jdk/src/share/native/java/io/io_util.h
jdk/src/solaris/native/java/io/io_util_md.c
jdk/src/solaris/native/java/io/io_util_md.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/java_io_FileDescriptor.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileInputStream.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileOutputStream.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileSystem.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_ObjectStreamClass.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_UnixFileSystem.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Double.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Float.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Integer.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Long.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Runtime.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Shutdown.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_StrictMath.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_String.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_System.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Thread.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Throwable.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_DatagramPacket.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet4Address.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet4AddressImpl.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet6Address.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet6AddressImpl.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_InetAddress.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_InetAddressImplFactory.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_NetworkInterface.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_PlainDatagramSocketImpl.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_PlainSocketImpl.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketInputStream.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketOptions.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketOutputStream.h
jdk/src/share/native/java/lang/java_props.h
jdk/src/solaris/native/java/lang/java_props_md.c
jdk/src/share/native/java/util/zip/Adler32.c as java_util_zip_Adler32.c
jdk/src/share/native/java/util/zip/CRC32.c as java_util_zip_CRC32.c
build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_CRC32.h
jdk/src/share/native/java/util/zip/Deflater.c as java_util_zip_Deflater.c
build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_Deflater.h
jdk/src/share/native/java/util/zip/Inflater.c as java_util_zip_Inflater.c
build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_Inflater.h
jdk/src/share/native/java/util/zip/ZipFile.c as java_util_zip_ZipFile.c
build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_ZipFile.h
jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
jdk/src/share/native/common/jlong.h
jdk/src/solaris/native/common/jlong_md.h
jdk/src/share/native/common/jni_util.c
jdk/src/share/native/common/jni_util.h
jdk/src/solaris/native/common/jni_util_md.c
jdk/src/share/javavm/export/jvm.h
jdk/src/solaris/javavm/export/jvm_md.h
jdk/src/solaris/native/java/net/linux_close.c
jdk/src/share/native/sun/misc/NativeSignalHandler.c
jdk/src/solaris/native/sun/nio/ch/NativeThread.c
jdk/src/share/native/java/net/net_util.c
jdk/src/share/native/java/net/net_util.h
jdk/src/solaris/native/java/net/net_util_md.c
jdk/src/solaris/native/java/net/net_util_md.h
jdk/src/solaris/native/java/net/NetworkInterface.c
jdk/src/share/native/sun/nio/ch/nio.h
jdk/src/solaris/native/sun/nio/ch/nio_util.h
jdk/src/share/native/java/io/ObjectStreamClass.c
jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
jdk/src/solaris/native/java/net/PlainSocketImpl.c
jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
jdk/src/share/native/java/lang/Runtime.c
jdk/src/share/native/java/lang/Shutdown.c
jdk/src/share/native/sun/misc/Signal.c
jdk/src/solaris/native/java/net/SocketInputStream.c
jdk/src/solaris/native/java/net/SocketOutputStream.c
jdk/src/share/native/java/lang/StrictMath.c
jdk/src/share/native/java/lang/String.c
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/sun_misc_NativeSignalHandler.h
build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/sun_misc_Signal.h
build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/sun_net_spi_DefaultProxySelector.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileChannelImpl.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileDispatcherImpl.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileKey.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_IOStatus.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_IOUtil.h
build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_NativeThread.h
jdk/src/share/native/java/lang/System.c
jdk/src/share/native/java/lang/Thread.c
jdk/src/share/native/java/lang/Throwable.c
jdk/src/solaris/native/java/io/UnixFileSystem_md.c
jdk/src/solaris/native/java/lang/UNIXProcess_md.c
jdk/src/share/native/java/util/zip/zip_util.c
jdk/src/share/native/java/util/zip/zip_util.h
Change-Id: Ib237df4e1b7b5b4d9f12e74d189e6ec9eed3c31d
|