Commit Graph

13469 Commits

Author SHA1 Message Date
Sergio Giro
c0f7d4c65b Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba
am: 6c753ca336

Change-Id: I3f6c8546ff116fbfcf11c0c0f5b168f56503e22f
2016-09-07 12:28:09 +00:00
Sergio Giro
724155a3be Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1
am: 52e0434748

Change-Id: I4e631cb3d354b2bba2dd0ced239edf60588d12a3
2016-09-07 12:28:00 +00:00
Sergio Giro
fcc05f0f66 Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d
am: 09a2121d5d

Change-Id: I8e2002564fbdc2aea638538bb8954e44d882900e
2016-09-07 12:27:54 +00:00
Sergio Giro
9fb957c4e5 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8
am: 290f2bb2a0

Change-Id: I0030e50dc05e88979d50e73feeb778c79ece47fc
2016-09-07 12:23:41 +00:00
Sergio Giro
12d3d4bbba Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" 2016-09-07 12:08:27 +00:00
Sergio Giro
6767fd28b1 Merge "java.security.PKCS12Attribute: port class from jdk8u60" 2016-09-07 12:07:13 +00:00
Sergio Giro
4c2df18a4d Merge "java.security.SecureRandom: add getInstanceStrong() method" 2016-09-07 12:05:35 +00:00
Sergio Giro
59c0fcf0c8 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" 2016-09-07 12:04:21 +00:00
Sergio Giro
53f16c8db7 java.security.cert.X509CRL: add new method verify(PublicKey, Provider)
New method introduced in Java 8. This method has a "default" implementation
in order to avoid breaking providers who construct concrete subclasses.

Unfortunately this implementation always results in an infinite loop, and
has thus been changed by an UnsupportedMethodOperation, with a TODO note
as to improve the situation if possible.

java/security/cert/X509CRL: add "default" method
sun/security/x509/X509CRLImpl: add declaration for that particular
implementation

Also, cosmetic changes like:
- use of @code tags instead of <code>
- use of static fields using the class name instead of instance name

This completes the port of this package to jdk8u60.

Bug: 29631070
Bug: 31294527
Test: make droid docs; old-cts run cts --class libcore.java.security.cert.X509CRLTest
Change-Id: Iccdfa3625a9ff2e7b808c22bce59ff75ae903e8a
2016-09-06 14:13:57 +01:00
Sergio Giro
23d2e40334 java.security.SecureRandom: add getInstanceStrong() method
Port SecureRandom to jdk8u60.

The method getInstanceStrong returns a strong random number
generator. In Android this is assumed to be the one from
OpenSSLProvider.

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags and use of a package-info.java in
place of a package.html file.
- Added comments.
- Uses of java.security.util.Debug (commented-out as that
debugging mechanism is not available in Android).
- Added braces in control flow blocks.

Test: make droid docs, vogar SecureRandomTest
Bug: 29631070
Change-Id: I9080fbd5e9292d7cb3eaa234f7c5849411336fac
2016-09-01 17:24:40 +00:00
Neil Fuller
328d9f5fc3 Merge "Track exposure of new j.l.reflect methods" am: 47784a790b
am: e24533d033

Change-Id: I5d2ddd071a79d62cf878b45113a6f7f3c44071aa
2016-09-01 13:28:23 +00:00
Neil Fuller
47784a790b Merge "Track exposure of new j.l.reflect methods" 2016-09-01 13:15:52 +00:00
Sergio Giro
2cab523ef2 java.security.PKCS12Attribute: port class from jdk8u60
This class provides facilities to deal with attributes in entries for
PKCS12 keystores.

Test: check-ojluni-files, make droid docs, vogar PKCS12AttributeTest
Bug: 29631070
Change-Id: I8d40fe126f189d503d6df7bfa45c4763bb7cb0d1
2016-09-01 12:49:07 +00:00
Sergio Giro
61c0996d6f Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98
am: e639bbd7d0

Change-Id: I4fa9f37094b3679868732b93eab2dfe1e6429d7d
2016-08-31 14:15:46 +00:00
Sergio Giro
d4b193c30c Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc
am: 8a5790a287

Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145
2016-08-31 14:04:09 +00:00
Sergio Giro
0c8c4a5d98 Merge "java.security.Principal: add default method Principal#implies" 2016-08-31 13:51:37 +00:00
Sergio Giro
c7bd0d0adc Merge "java.security.SecretKey: now extends from Destroyable" 2016-08-31 13:50:23 +00:00
Sergio Giro
e04c029ed5 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285
am: 565c1fbf8b

Change-Id: Iec116355209c0770b4125142f93873766e29d61d
2016-08-31 12:42:32 +00:00
Sergio Giro
d53ae2c285 Merge "java.security: update java.security.KeyStore to jdk8u60" 2016-08-31 12:24:48 +00:00
Sergio Giro
0ac5c50850 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017
am: 47f7d8384b

Change-Id: Ib1384141da63cae9341335b79dc585267073c4bb
2016-08-31 08:31:17 +00:00
Sergio Giro
9484bff017 Merge "java.security.cert: update classes in java.security.cert (part 2)" 2016-08-31 08:18:57 +00:00
Sergio Giro
71b95041d6 java.security: update java.security.KeyStore to jdk8u60
Pulling upstream changes from OpenJDK version jdk8u60 for
java.security.KeyStore.

- New method getAttributes in KeyStore.Entry
- New interface Attribute in KeyStore.Entry
- New constructor specifying protection algorithm and protection parameters in
KeyStore.PasswordProtection.
- New getters for protection algorithm and protection parameters in
KeyStore.PasswordProtection
- In PrivateKeyEntry, SecretKeyEntry and TrustedCertificateEntry, new
constructor allowing to specify attributes, and corresponding getter
getAttributes.

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags.
- Tidied up casts/generics.

This completes the port to jdk8u60 for this class.

Change-Id: Ifec9d07b8f6c367a6fa2672fd5c43747057336ad
Test: make droid docs, vogar KS*{Entry,Password}*.java
Bug: 29631070
2016-08-30 19:57:43 +00:00
Sergio Giro
6f285fa91e java.security.Principal: add default method Principal#implies
Given a Subject, Principal#implies returns true iff the principal
is one of the subject's principals.

Bug: 29631070
Test: make droid docs, vogar PrincipalTest.java
Change-Id: Ic24ca4bc26e29abdb67481af8255b8b1683a6f3a
2016-08-30 19:26:17 +01:00
Sergio Giro
7cdfa7499a java.security.SecretKey: now extends from Destroyable
Also:
- added comments
- replace <code> by @code tags

This completes the port of SecretKey to jdk8u60.

Bug: 29631070
Test: make droid docs
Change-Id: Id3604c1e62855d9fa9bf02a704c79c6d2131b006
2016-08-30 18:44:11 +01:00
Neil Fuller
671d9ce289 Track exposure of new j.l.reflect methods
Modifier.parameterModifiers() and Class.toGenericString().

Bug: 28666126
Change-Id: Idd230540e15aa5c298739a7ba72ed3e47159d037
2016-08-30 15:51:07 +01:00
Neil Fuller
c1d52a634c Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c
am: 033101bb99

Change-Id: I230bfff78e929b646c044f0f362531f05e16f632
2016-08-30 14:39:26 +00:00
Neil Fuller
2cc1eed174 Track libcore java.lang.reflect API changes
The modifications to Class / Field affect the .txt file
for no good reason: the use of a different generic
variable name results in changes because the tools think
methods have been added / removed when they haven't.

The only interface change from upstream included is adding
"extends AnnotatedElement" to GenericDeclaration. All (platform)
subclasses already did implement this interface. App classes may
be affected but only if they do not currently implement those
methods and they are somehow called.

Bug: 28666126
Test: cts ran for libcore (libcore, harmony_java_lang, org)
Change-Id: Ice5afb80834d7f7a4d23dade21a1590c6b323ed8
2016-08-30 12:08:10 +01:00
Neil Fuller
d8d495f1eb Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa
am: eefc000601

Change-Id: Ia11ce811cd9a23e4c8979bd5c8429d9f918778bf
2016-08-26 15:16:56 +00:00
Neil Fuller
2af6c750ba Track java.lang.reflect.Executable API changes
Bug: 28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
2016-08-26 10:44:51 +01:00
Sergio Giro
5a2297190a java.security.cert: update classes in java.security.cert (part 2)
Pulling upstream changes from OpenJDK version jdk8u60 classes
in java.security.cert

- Certificate#hashValue: cache the hash value as to avoid recomputation.
Use the Arrays#hash instead of a simple ad-hoc function.
- Certificate#verify(PublicKey, Provider): new method that just throws
UnsupportedOperationException.

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags and use of a package-info.java in
place of a package.html file.
- Added comments.

Note not all classes in java.security.cert are updated:  X509CRL has more
significant changes and deserves a separate CL.

Change-Id: I44120f1b34c9dc3c062a5d01583bcc87fa2cd558
Test: make droid docs, vogar CertificateTest
Bug: 29631070

Please enter the commit message for your changes. Lines starting
2016-08-25 15:17:58 +01:00
Sergio Giro
0d342700c8 java.security: port DomainLoadStoreParameter from jdk8u60
This class is introduced in Java 8

Change-Id: Ibb6dbbeba99cdc97c8da5019d11160c3ce6aa690
Test: check-ojluni-files; make droid docs; vogar DomainLoadStoreParameterTest.java
Bug: 29631070
2016-08-25 14:57:54 +01:00
Sergio Giro
263820bb2c frameworks/base: add changes coming from aosp
am: 29835cc56e

Change-Id: Ia89b81f3d5c1d8a4d20280355bb9d27b655098d3
2016-08-24 15:39:00 +00:00
Sergio Giro
29835cc56e frameworks/base: add changes coming from aosp
Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211

Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277
2016-08-24 15:45:02 +01:00
Tobias Thierer
900471ab11 Revert "Revert "Track libcore update of Map classes to jdk8u60""
am: 7f5095ddfe

Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
2016-08-17 17:54:08 +00:00
Tobias Thierer
6f15eabd29 Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master 2016-08-17 17:38:48 +00:00
Tobias Thierer
7f5095ddfe Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 7783213611.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
2016-08-17 17:11:01 +00:00
Tobias Thierer
8fc0ac9b39 Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2
am: 17fea8b967

Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
2016-08-17 17:03:44 +00:00
Tobias Thierer
17fea8b967 Merge "Track libcore update of Map classes to jdk8u60."
am: ec6a323da2

Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
2016-08-17 16:54:30 +00:00
Tobias Thierer
5efe2b7515 Revert "Track libcore update of Map classes to jdk8u60"
am: 7783213611

Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
2016-08-17 16:54:08 +00:00
Tobias Thierer
eb4eeb5323 Track libcore update of Map classes to jdk8u60
am: fb2ade3dca

Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
2016-08-17 16:54:05 +00:00
Tobias Thierer
7783213611 Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.

Bug: 30911913

This reverts commit fb2ade3dca.

Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
2016-08-17 14:59:28 +00:00
Tobias Thierer
fb2ade3dca Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640

This CL requires base CLs, which will get merged from aosp-master,
in order to build.

Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
2016-08-17 11:06:27 +01:00
Tobias Thierer
9d332f2dc8 Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.

Test: make update-api

Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
2016-08-16 14:16:41 +01:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4)
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
2016-08-11 22:18:19 +00:00
Yi Kong
d5e8edfe1d Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
am: 19df48b93b

Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
2016-08-09 18:07:29 +00:00
Yi Kong
19df48b93b Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit f646aa14cd)
2016-08-09 18:57:16 +01:00
Yi Kong
f646aa14cd Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
2016-08-09 16:43:32 +00:00
Tobias Thierer
22aa35d510 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1
am: c548ff23bd

Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
2016-08-05 12:51:50 +00:00
Tobias Thierer
c548ff23bd Merge "APIs for ProcessBuilder.Redirect"
am: e49469aed1

Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
2016-08-05 12:44:48 +00:00
Tobias Thierer
95b759e178 Update api/test-current.txt for ProcessBuilder API
am: 6af44aeea0

Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
2016-08-05 12:44:35 +00:00