Commit Graph

13785 Commits

Author SHA1 Message Date
Tobias Thierer
e1edfb3008 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6 am: 24bd141ce0
am: 8cdc25b4b3

Change-Id: I83723322bfd4db3290fd831210ba1fc03c51e22a
2016-09-08 13:31:09 +00:00
Tobias Thierer
8cdc25b4b3 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6
am: 24bd141ce0

Change-Id: I15b2aaaf8d6791d4a561fa935c7ab960ac22c4d8
2016-09-08 13:26:11 +00:00
Tobias Thierer
63a07e80d6 Merge "Add Base64 from OpenJDK 8u60" 2016-09-08 13:10:15 +00:00
Sergio Giro
374edfe1f7 Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920 am: 81749ef47f
am: fc0ee229bb

Change-Id: I6b998e9a89c75f4869fcae144a8ce8b7ea40bb34
2016-09-08 12:37:44 +00:00
Sergio Giro
fc0ee229bb Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920
am: 81749ef47f

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d
2016-09-08 12:32:42 +00:00
Sergio Giro
8445702920 Merge "java.security.Provider: port to jdk8u60 (second part)" 2016-09-08 12:18:43 +00:00
Yi Kong
c0579c5fb7 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7 am: b2d6acaa2b
am: 541b91fe64

Change-Id: I34d1dbc11268b935cd61204954ce56248346f888
2016-09-08 10:17:57 +00:00
Yi Kong
541b91fe64 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7
am: b2d6acaa2b

Change-Id: I756b0c2366737f22447ead5f26435ffb4b0425cb
2016-09-08 10:12:54 +00:00
Yi Kong
a4cc9028bf Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f
Bug: 30992227
Change-Id: I33c25562468f5803e211910f50116b501b66fe56
2016-09-07 16:17:55 +00:00
Sergio Giro
ff14a693b9 Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336
am: c0f7d4c65b

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

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

Change-Id: I1b68d4f89349567a78935c4e50b2387db8acc9b0
2016-09-07 12:33:51 +00:00
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
ebebc24c21 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0
am: 9fb957c4e5

Change-Id: Ia497ce4aec873aa9a74099f0dadbf9fe81424205
2016-09-07 12:27:51 +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
Tobias Thierer
d20952e238 Add Base64 from OpenJDK 8u60
Test: make update-api
Bug: 29935305

Change-Id: Idc1cfadd78553dd05a7cb1f9ebd02858a3675e51
2016-09-05 22:01:40 +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
Sergio Giro
94adef75af java.security.Provider: port to jdk8u60 (second part)
- Add overridings for HashMap operations

Provider is a subclass of HashMap. When operations are on
Strings, they must be processed as part of the
algorithm->implementation mapping of the provider, and
so these methods must be overriden accordingly.

Newly overridden Methods added are:

compute, computeIfAbsent, computeIfPresent, getOrDefault,
merge, putIfAbsent, replace, replaceAll.

- Check that classes and constructors are public when
creating instances of services.

- Cosmetic changes like use of {@code} instead of <code>

Bug: 29631070
Test: make droid docs; vogar ProviderTest
Change-Id: I0238f4a48f31ddc50a3f18c27515023940d9ba02
2016-09-01 18:19:50 +01:00
Neil Fuller
f1e8aed4cd Merge "Track exposure of new j.l.reflect methods" am: 47784a790b am: e24533d033
am: 328d9f5fc3

Change-Id: Ic6e8a60a33d92dec19947a9a298e26f01482abf0
2016-09-01 13:34:14 +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
016e850921 Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0
am: 61c0996d6f

Change-Id: I4ea45e1007f5bbbd086d200f5be9227a03eab44d
2016-08-31 14:21:41 +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
22b8317a49 Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287
am: d4b193c30c

Change-Id: I34fac82dc8bfbd157b70b637a13d188692b3b5e2
2016-08-31 14:09:44 +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
87ececf5c8 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b
am: e04c029ed5

Change-Id: Ib38154e6828802889d4f4e385e109de925ece1bc
2016-08-31 12:51:16 +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
7790666747 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b
am: 0ac5c50850

Change-Id: Iebb89cfa34482e3af937a6e15c97b146e875ebef
2016-08-31 08:37:24 +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
672e0b3211 Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c am: 033101bb99
am: c1d52a634c

Change-Id: I312e5b61c69a8ac366120127c18b094c4a14b2b1
2016-08-30 14:45:08 +00: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
d97db3e80e Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa am: eefc000601
am: d8d495f1eb

Change-Id: I67e9aecd97ff9501af2839a80b3430db9678882e
2016-08-26 15:23:50 +00: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