summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseSergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 am: 485552e5d2 am: c47471be71 am: dc814878da am: dd64614fe4 Change-Id: I8e8d6d9386965e120341c9053974c26de2f4a768
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵nougat-cts-devSergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 am: 485552e5d2 am: c47471be71 am: dc814878da Change-Id: I470e04d374d859355fefe83a830eadf233e21655
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵Sergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 am: 485552e5d2 am: c47471be71 Change-Id: Ice8ce478066f1cedc7b2cbb172026c24a0d99eb3
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵Sergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 am: 485552e5d2 Change-Id: Idc4af1f1e3e651634de604410d041d41a19bf6ae
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵Sergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 Change-Id: I65510a067254a66d99fbcdc1e12bf894b761fe35
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵Sergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 Change-Id: I8106c27afc25af631db4bb0464f5c8376f1318a4
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵Sergio Giro
48c093f131 am: b529b45d02 am: 11297dc70a Change-Id: I7487863d94dc7021e8d12cd9b2ab9e794ad1b573
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specified am: ↵Sergio Giro
48c093f131 am: b529b45d02 Change-Id: Ie4b3935a4207f032a2ef9bfe74cf19f14fdfbf73
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specifiedSergio Giro
am: 48c093f131 Change-Id: Id2e98d77e8a855b30880b2fb1e189f49781c6e6c
2016-07-19GCMParameters: in ASN1 encoding, use 12 when no value is specifiedSergio Giro
This reverts commit 4d0e19131da68053fe1a73d43052bedadb107c70 Bug: 26231099 Bug: 26234568 Bug: 29876633 Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
2016-04-28ASN1: Use an explicit locale for ASN1 UTC / Generalized times.Narayan Kamath
am: 7c335a5 * commit '7c335a5d575470ba944cb41d0ac655d7087422d1': ASN1: Use an explicit locale for ASN1 UTC / Generalized times. Change-Id: I45fe5d9ea0ac63c6be4f7e0dc0dab2e515160491
2016-04-27ASN1: Use an explicit locale for ASN1 UTC / Generalized times.nougat-devNarayan Kamath
Using the default locale can result in bad behaviour, for example when the locales numberformat doesn't use arabic numerals. bug: 28384942 Change-Id: I4e240d9710c0427d809410df3a762c80125a821c
2016-04-18Revert "Strings: hardcode "\n" as the line separator"Sergio Giro
am: cf7021d * commit 'cf7021d93b868e5f72781d0f49b56447fc226639': Revert "Strings: hardcode "\n" as the line separator" Change-Id: Iee4e838bb8e3d86465c443e83c9659d6c1119b00
2016-04-18Revert "Strings: hardcode "\n" as the line separator"Sergio Giro
This reverts commit 7ddf37c01b68ff9d2de3a9dcb637d2b962b442ef. Not needed anymore because of: d4fa9f4ddc1c1f193b623c8da80384b4c510a1b4 Bug: 27265238 Bug: 28108158 Bug: 28174137 Change-Id: Icce1fd747459f07fbe5a4991897083315f78153d
2016-04-12Merge "EC: add bug number in TODO comment about registrations failing" into ↵Sergio Giro
nyc-dev
2016-04-12EC: add bug number in TODO comment about registrations failingSergio Giro
Bug: 20447540 Bug: 26929227 Change-Id: I390fb8f70aa5ce982e54cdc7068d47af2c5f7a0a
2016-04-11Strings: hardcode "\n" as the line separatorSergio Giro
For android, it's already hardcoded in System.java It was trying to use System.getProperty("line.separator"); causing the class not to be compile-time initializable, causing performance problems, see bug. Bug: 28108158 Change-Id: I2a2549ce477d94e95e8239d97307eaaf50c05d6b
2016-04-05Merge "Permit arbitrary DSA keys when verifying signatures." into nyc-devAlex Klyubin
2016-04-05Merge "BaseBlockCipher: do not use PKCS12 for BCPBEKeys without IV" into nyc-devSergio Giro
2016-04-05BaseBlockCipher: do not use PKCS12 for BCPBEKeys without IVSergio Giro
Also, for such keys, do not create a random IV nor throw an exception when decrypting, just assume the IV is 0. Bug: 27224566 Bug: 27994930 Bug: 27995180 Change-Id: I4d8dd44e7390199fc60797f9bd2c56174d8dfcba
2016-04-04Permit arbitrary DSA keys when verifying signatures.Alex Klyubin
This is a follow-up to 867b6e16a13ab7a83cdf9b6f83249ccbf80b552c which modified JCA DSA Signature implementation to reject keys which don't use sensible parameters. Unfortunately, that commit was too strict and rejected keys not just when signing, but also when verifying. For backwards compatibility reasons this commit removes the checks from signature verification logic. Keys that don't use sensible parameters are still rejected during attempts to produce new signatures. Bug: 24082558 Bug: 27947262 Change-Id: I2e1f76dc56c15c25000b70063428d460854e7b57
2016-04-01Remove workaround Jack bug on package renamingYohann Roussel
The bug was preventing correct package renaming when classpath was incomplete, this is now fixed so cleaning. (cherry picked from commit 6e29fc2fc5db3a88996d9a6e3f4b3af9bd5799ae) Bug: 27491842 Bug: 27812109 Change-Id: I4f2571c1d3967bdfd3d3f26b1fee4623d98c5fe3
2016-04-01Add OCSP files for testing purposesKenny Root
Testing OCSP support needs some ASN.1 creation utilities. Bouncycastle has them, but we don't want to bloat up the built-in libraries. Add some new targets that will allow us to enable OCSP testing in the core-tests module without spreading it elsewhere. (cherry picked from commit 4eb438010b8024cfa97cdad1906a8e6963a16f5b) Bug: 27812109 Change-Id: I4a75fc0d5186c70a764baa751ceab75d1a44539d
2016-03-18Merge "KeyPairGeneratorSpi: remove TODO about creating a SecureRandom" into ↵Sergio Giro
nyc-dev
2016-03-18KeyPairGeneratorSpi: remove TODO about creating a SecureRandomSergio Giro
Seems the right thing to do, there's nothing else to check (cherry picked from commit 352a2b5ce27f9b73d9a1a920eb7223e7c0b6c730) Bug: 27063703 Change-Id: I51c961feae9bf99ee961d5a80d3db83d6177ad48
2016-03-18Merge "BaseBlockCipher: removed TODO about checking a fix" into nyc-devSergio Giro
2016-03-18BaseBlockCipher: removed TODO about checking a fixSergio Giro
Fix was now agreed with BC maintainer (cherry picked from commit c50bf623dd894b82d48379baacb8b74de52a9087) Bug: 27061541 Change-Id: Idac385bc5101d1b744b70ee4a1d26682df348003
2016-03-18Merge "BaseBlockCipher: for BCEPBEKeys, ignore parameters if no IV is ↵Sergio Giro
present" into nyc-dev
2016-03-16Use official name for SHA1withECDSAKenny Root
(cherry picked from commit 74e960449ba0a4633c2164d9b7708dcfb558030d) Bug: 27269590 Change-Id: Ief933e31875aec69cb96c1691a9a6480e6719dac
2016-03-16BaseBlockCipher: for BCEPBEKeys, ignore parameters if no IV is presentSergio Giro
Bug: 27224566 Change-Id: I41ffba9a23770c1c0deea6969c0a4d8c551d8ab3
2016-02-29DSASigner: fix key check when no digest specifiedKenny Root
Since the digest specified was a NullDigest, its effective length during initialization is 0 bytes, so there is no way to tell if the key strength is appropriate at that time. Bug: 21630204 Bug: 27247313 Change-Id: I0f60ac5d62ae54119fd432cf828a2282418e8f39
2016-02-23GCMParameters: fix insecure tag size am: 4d0e19131d am: 9ca2dfa49b am: ↵Sergio Giro
bc2920a011 am: abff585398 * commit 'abff585398e17ca95561cb7e0612f865077d9c01': GCMParameters: fix insecure tag size
2016-02-23GCMParameters: fix insecure tag size am: 4d0e19131d am: 9ca2dfa49bSergio Giro
am: bc2920a011 * commit 'bc2920a01178e113adae55c9c49883395a554448': GCMParameters: fix insecure tag size
2016-02-23GCMParameters: fix insecure tag size am: 4d0e19131dSergio Giro
am: 9ca2dfa49b * commit '9ca2dfa49bd6ea3a9731d1349fe0191e018bf909': GCMParameters: fix insecure tag size
2016-02-23GCMParameters: fix insecure tag sizeSergio Giro
am: 4d0e19131d * commit '4d0e19131da68053fe1a73d43052bedadb107c70': GCMParameters: fix insecure tag size
2016-02-23GCMParameters: fix insecure tag sizeSergio Giro
Note: port of cr/110497945 Bug: 26231099 Bug: 26234568 Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d
2016-02-16Force bouncycastle to continue to use v51 (1.7) .class filesNeil Fuller
The default is changing to v52 (1.8). The build for this package uses jarjar to repackage .class files. The version of jarjar in the Android tree does not currently support v52 .class files. Bug: 26753820 Change-Id: Ie1e926ad429f60784158ff75102f9d1cde51272d
2016-02-10bouncycastle: upgrade to version 1.54Sergio Giro
Merge remote-tracking branch 'aosp/upstream-master' (cherry picked from commit 4a2d5c40ffefaaa02c656a091f33fecdf8592607) Change-Id: Icd734732677bc8ed04d8cd78bbb686efa152ed58
2016-02-01DSASigner: add imports missing after resolving conflictSergio Giro
Diff after this chnage shows no difference with respect to 99cbec7970df89800c3592544c47fbd19430b764 (last commit before merging from bouncycastle upstream). Change-Id: I58f35ee4fa01e3a78305c5ebba9b8d125b49a838
2016-02-01Merge "Restoring the contents of aosp after" am: 3e75bd6b40Sergio Giro
am: 4c951c2970 * commit '4c951c2970bbfcf318d58cde213ccbee935545a9': Restoring the contents of aosp after
2016-02-01resolve merge conflicts of 7fbe01fd6e to master.Sergio Giro
Change-Id: I98b0db452ed915b9589dbc7164ea4800eadb9d1e
2016-02-01Merge "Restoring the contents of aosp after"Sergio Giro
am: 3e75bd6b40 * commit '3e75bd6b407dd472c834a50f16aae54cca67ea9c': Restoring the contents of aosp after
2016-02-01Merge "Merge remote-tracking branch \'aosp/upstream-master\' into ↵Sergio Giro
merge-152-from-upstream" am: 9218edabd1 * commit '9218edabd1ef9852bc2f13115dcadc81b442dd6c': Update elements in android tree as in aosp and goog ToT bouncycastle: Android tree with upstream code for version 1.52 Update elements in android tree as in mnc-dev bouncycastle: Android tree with upstream code for version 1.50 Update elements in android tree as in lmp-dev bouncycastle: Android tree with upstream code for version 1.49
2016-02-01Merge "Restoring the contents of aosp after"Sergio Giro
2016-02-01Restoring the contents of aosp afterSergio Giro
https://android-review.git.corp.google.com/#/c/199871 git diff 9b30eb05e5be69d51881a0d1b31e503e97acd784 (ToT before submitting the patch above) doesn't show any differences Change-Id: I9f424a67094839f1893a23cd46ec7d6f0992ac26
2016-02-01Merge "Merge remote-tracking branch 'aosp/upstream-master' into ↵Sergio Giro
merge-152-from-upstream"
2016-02-01Merge remote-tracking branch 'aosp/upstream-master' into merge-152-from-upstreamSergio Giro
As to set a common ancestor for future merges from aosp/upstream-master (when updating to new versions of bouncycastle). We'll override all the changes of this commit with patch https://android-review.googlesource.com/#/c/199872 Change-Id: I53a7f797b520a6e119878dbae53246cdcc585ddf
2016-02-01Merge "Update elements in android tree as in aosp and goog ToT" into ↵Sergio Giro
upstream-master
2016-02-01Update elements in android tree as in aosp and goog ToTSergio Giro
Android tree as in goog 99cbec7970df89800c3592544c47fbd19430b764 and aosp 9b30eb05e5be69d51881a0d1b31e503e97acd784 git diff aosp/master goog/master --name-only shows no differences except for bouncycastle sources Change-Id: I631ce52c4fdd21780abe9858f9eb5ef31988f2dd
2016-02-01Merge "bouncycastle: Android tree with upstream code for version 1.52" into ↵bouncycastle-upstream_mnc-drbouncycastle-upstream_mncSergio Giro
upstream-master
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 18:39:11 +0000