summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0a934061cf am: e892a62257 -s ours am skip reason: subject contains skip directive Change-Id: I67931cb64b93ee9af0fad6373cb39b4aa78afaa5
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 0a934061cf Change-Id: I53d5e1341a3df2970d6a448efef8c37ab3adb44e
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ia41e72df732a1f779dd0c4eb0f39a419685e5193
2019-07-24Add in TEST_MAPPING for acloud unittests. am: e9a9eff135 am: 1e870d094f am: ↵Kevin Cheng
421e37f785 am: d34e731b1f am: 6aa5607fc9 Change-Id: I371d0a37b3179dab5b06c6b49c4bc3f6b0b20040
2019-07-23Add in TEST_MAPPING for acloud unittests. am: e9a9eff135 am: 1e870d094f am: ↵Kevin Cheng
421e37f785 am: d34e731b1f Change-Id: I051fc93216c4dcf0646d14374ba043239a227697
2019-07-23Add in TEST_MAPPING for acloud unittests. am: e9a9eff135 am: 1e870d094fKevin Cheng
am: 421e37f785 Change-Id: I7a129e16f4f0723f38a4d8bbb8fc39f4236b3b9c
2019-07-23Add in TEST_MAPPING for acloud unittests. am: e9a9eff135Kevin Cheng
am: 1e870d094f Change-Id: I9daf4bdee68553036cd2850c008e3d57b5b6dbc1
2019-07-23Add in TEST_MAPPING for acloud unittests.ndk-sysroot-r21Kevin Cheng
am: e9a9eff135 Change-Id: I71869de7484adf0208b9088ba8aea713e11d601c
2019-07-23Add in TEST_MAPPING for acloud unittests.Kevin Cheng
Bug: 124250384 Test: atest Change-Id: I173e66efd8a938d815598b9d844cc34dcff94520
2019-05-09Merge commit '83aa36d' into import am: 4db398a410 am: 6a131d157fKevin Cheng
am: 4db6738c5f Change-Id: If66eea495e7b7282485ad7ced53fecde36995550
2019-05-09Merge commit '83aa36d' into import am: 4db398a410Kevin Cheng
am: 6a131d157f Change-Id: If21a24965fbb719a041ba4a349fc2255381947ca
2019-05-09Merge commit '83aa36d' into importKevin Cheng
am: 4db398a410 Change-Id: I0ef0d7788c76a7b575ed25f58fbe9714fbe5038e
2019-05-02Merge commit '83aa36d' into importKevin Cheng
Merged in version 2.5 and add in misc files. Bug: 122778810 Test: None Change-Id: I9c999773d30f4114ab1ce8aa44b27f3aa4ded80c
2019-03-13Initial empty repositoryandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r10android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r4android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r3android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r2android-10.0.0_r19android-10.0.0_r18android-10.0.0_r17android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-releaseandroid10-mainline-media-releaseandroid10-mainline-a-releaseandroid10-gsiandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseInna Palant
2019-01-22changelog and version bump for 2.5 (#4729)Paul Kehrer
2019-01-22allow asn1 times of 1950-01-01 and later. (#4728)Paul Kehrer
* allow asn1 times of 1950-01-01 and later. * add a test * pretty up the test
2019-01-21allow 32-bit platforms to encode certs with dates > unix epoch (#4727)Paul Kehrer
Previously we used unix timestamps, but now we are switching to using ASN1_TIME_set_string and automatically formatting the string based on the year. The rule is as follows: Per RFC 5280 (section 4.1.2.5.), the valid input time strings should be encoded with the following rules: 1. UTC: YYMMDDHHMMSSZ, if YY < 50 (20YY) --> UTC: YYMMDDHHMMSSZ 2. UTC: YYMMDDHHMMSSZ, if YY >= 50 (19YY) --> UTC: YYMMDDHHMMSSZ 3. G'd: YYYYMMDDHHMMSSZ, if YYYY >= 2050 --> G'd: YYYYMMDDHHMMSSZ 4. G'd: YYYYMMDDHHMMSSZ, if YYYY < 2050 --> UTC: YYMMDDHHMMSSZ Notably, Dates < 1950 are not valid UTCTime. At the moment we still reject dates < Jan 1, 1970 in all cases but a followup PR can fix that.
2019-01-21bind EVP_R_MEMORY_LIMIT_EXCEEDED and update a test (#4726)Paul Kehrer
* bind EVP_R_MEMORY_LIMIT_EXCEEDED and update a test This will allow OpenSSL 1.1.1 on 32-bit (including our Windows 32-bit builders) to fail as expected. Technically this isn't a malloc error, but rather failing because the allocation requested is larger than 32-bits, but raising a MemoryError still seems appropriate * what you want an endif too?
2019-01-21Updated link to PKCS#3 -- fixes #4671 (#4722)Alex Gaynor
2019-01-21update jenkinsfile to compile openssl 1.1.1 on windows (#4725)Paul Kehrer
2019-01-21See if urllib3 tests pass on xenial nowadays (#4724)Alex Gaynor
2019-01-20Apparently NIST crypto resources are essential to life and property (#4721)Alex Gaynor
2019-01-20deprecate encode_point and migrate all internal callers (#4720)Paul Kehrer
2019-01-20add support for encoding compressed points (#4638)Paul Kehrer
* add support for encoding compressed points * review feedback
2019-01-19shake128/256 support (#4611)Paul Kehrer
* shake128/256 support * remove block_size * doc an exception * change how we detect XOF by adding _xof attribute * interface! * review feedback
2019-01-19expose the ed448 nid (#4717)Paul Kehrer
we already did all the conditional binding, but forgot to actually expose it.
2019-01-18consistently linky RFC in the docs (#4716)Alex Gaynor
* consistently linky RFC in the docs * oops
2019-01-18Fixed #4700 -- linkify method in changelog (#4715)Alex Gaynor
* Fixed #4700 -- linkify method in changelog * fixed linkification * oxford comma * line length
2019-01-17Bump this way up and see if it helps (#4713)Alex Gaynor
2019-01-17changelog for byteslike (#4712)Paul Kehrer
* changelog for byteslike * bertter prose
2019-01-17support byteslike in KBKDFHMAC (#4711)Paul Kehrer
2019-01-17support byteslike in ConcatKDF{HMAC,Hash}, Scrypt, and X963KDF (#4709)Paul Kehrer
* byteslike concatkdf * byteslike scrypt * byteslike x963kdf
2019-01-17support byteslike for OTP (#4710)Paul Kehrer
2019-01-17normalize KBKDF tests (#4708)Paul Kehrer
2019-01-17Support byteslike in HKDF and PBKDF2HMAC (#4707)Paul Kehrer
* support byteslike in HKDF * support byteslike in PBKDF2HMAC * add missing docs
2019-01-17support bytes-like for X25519PrivateKey.from_private_bytes (#4698)Paul Kehrer
yuck.
2019-01-17x448 and x25519 should enforce key lengths in backend (#4703)Paul Kehrer
* x448 and x25519 should enforce key lengths in from_private_bytes they should also check if the algorithm is supported like the public bytes class methods do * oops * move the checks
2019-01-17support byteslike in hmac update (#4705)Paul Kehrer
needed for some KDF keying material
2019-01-16support byteslike in hash updates (#4702)Paul Kehrer
This is needed to handle keying material in some of the KDFs
2019-01-16support bytes-like keys in CMAC and HMAC contexts (#4701)Paul Kehrer
2019-01-16add support for byteslike password/data to load_{pem,der}_private_key (#4693)Paul Kehrer
* add support for byteslike password/data to load_{pem,der}_private_key * pypy 5.4 can't do memoryview from_buffer
2019-01-16turn off hypothesis deadlines, enforced by default in 4.0 (#4696)Paul Kehrer
we don't care about exceeding a deadline in CI because our infra has wild variability and this can just randomly happen.
2019-01-15support byteslike in aead for key and nonce (#4695)Paul Kehrer
2019-01-15support byteslike in X448PrivateKey.from_private_bytes (#4694)Paul Kehrer
2019-01-15add support for byteslike on password and data for pkcs12 loading (#4690)Paul Kehrer
* add support for byteslike on password and data for pkcs12 loading * use a contextmanager to yield a null terminated buffer we can zero * review feedback * updated text * one last change
2019-01-15Remove a dead assignment (#4692)Alex Gaynor
2019-01-14Serialization x25519 (#4688)Paul Kehrer
* modify x25519 serialization to match x448 supports raw and pkcs8 encoding on private_bytes supports raw and subjectpublickeyinfo on public_bytes deprecates zero argument call to public_bytes * add docs * this is public now * don't need that * review feedback
2019-01-13Update wycheproof commit in docs (#4687)Alex Gaynor
2019-01-13add x25519 pkcs8/subjectpublickeyinfo vectors (#4685)Paul Kehrer
2019-01-13support x448 public/private serialization both raw and pkcs8 (#4653)Paul Kehrer
* support x448 public/private serialization both raw and pkcs8 * add tests for all other asym key types to prevent Raw * more tests * better tests * fix a test * funny story, I'm actually illiterate. * pep8 * require PrivateFormat.Raw or PublicFormat.Raw with Encoding.Raw * missing docs * parametrize * docs fixes * remove dupe line * assert something