Edwin Wong
95eadfe524
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 565bf1412a -s ours am: dfb89bddcd -s ours
...
am skip reason: skip tag Change-Id If62b73a9c636048f942a2fc63a13b5bfd1e57b86 with SHA-1 596d8bf4cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: Ib3b1270eb8f1749abddb1a83c5cb4f660c93c284
2021-04-06 22:47:17 +00:00
Edwin Wong
7c133308b8
[automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours am: 73eb4c2e8c -s ours
...
am skip reason: skip tag Change-Id If62b73a9c636048f942a2fc63a13b5bfd1e57b86 with SHA-1 596d8bf4cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: Id3290d873502cf1c12f8af91e874aa2f347cf7cd
2021-04-06 22:47:16 +00:00
Edwin Wong
dfb89bddcd
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 565bf1412a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: Id3190acf1d2fe9063aa963e8ad5a25f196281168
2021-04-06 22:27:01 +00:00
Edwin Wong
73eb4c2e8c
[automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: Ibd7e76d76dc65b836eeeeec4b9c13d483bc7f251
2021-04-06 22:27:00 +00:00
Edwin Wong
565bf1412a
Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: I8395e9fe48ec01c35b2e0ad60a29d101f34af3ee
2021-04-06 21:53:49 +00:00
Edwin Wong
a74c0ec1f0
[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: Ic310a2a04e47aea548ab74a6449c3f5835ee8049
2021-04-06 21:53:48 +00:00
Edwin Wong
a6cc3b79d2
Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev
2021-04-06 21:06:40 +00:00
Edwin Wong
08faef8926
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: eceedee2ea -s ours am: 34effc90d6 -s ours am: ea863fecd5 -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 0b18148b09 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I29318d3d09f3a0acfe9dda7938c9f60c67e4f7ee
2021-04-06 17:37:18 +00:00
Edwin Wong
ea863fecd5
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: eceedee2ea -s ours am: 34effc90d6 -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 0b18148b09 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I6595ec63f860070bba704943b274797d8b103a18
2021-04-06 16:54:36 +00:00
Edwin Wong
1afecc2230
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: 6e7f17dc74 -s ours am: f1a9139879 -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I47b63229c0f756a8218b1c1aef766e48bc328906
2021-04-06 05:44:58 +00:00
Edwin Wong
f1a9139879
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: 6e7f17dc74 -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I9a67c8eda7ef98e45ead4aa59a82a14de3804178
2021-04-06 05:07:07 +00:00
Edwin Wong
34effc90d6
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: eceedee2ea -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I3ced57ad41a646610a4a1778d574ebb37935f338
2021-04-05 22:37:14 +00:00
Edwin Wong
6e7f17dc74
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I7efab6993e597dcea31a8174290733ea3ed6b891
2021-04-05 22:01:23 +00:00
Edwin Wong
eceedee2ea
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I14c9d120522d4b0cc681c66df516264960758d98
2021-04-05 21:56:38 +00:00
Edwin Wong
048b09d987
Merge "Fix WVCryptoPlugin use after free vulnerability." into sc-dev am: 9d1ad7590a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13808139
Change-Id: I5c3e20d5ff77783e54ed8a6e1b3dac4d10bcc605
2021-04-05 21:37:28 +00:00
Edwin Wong
92865466af
Merge "Fix potential decrypt destPtr overflow." into rvc-dev
2021-04-05 21:22:06 +00:00
Edwin Wong
9d1ad7590a
Merge "Fix WVCryptoPlugin use after free vulnerability." into sc-dev
2021-04-05 20:47:48 +00:00
Alex Dale
eae12f517e
Merge "Restructed reference root of trust (1/3 Keybox)" into sc-dev am: 3e2c0f03e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13625375
Change-Id: I0f683148dd7ab94cacee9417430549c989bec103
2021-03-31 03:02:38 +00:00
Alex Dale
3e2c0f03e7
Merge "Restructed reference root of trust (1/3 Keybox)" into sc-dev
2021-03-31 02:22:07 +00:00
Bob Badour
a1b84662d4
[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine am: 7f34e59ce6 -s ours am: d476f90f74 -s ours
...
am skip reason: skip tag Change-Id I41ef520b6e394a7708f453a706e6ef1a5f46c36a with SHA-1 376f47047c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14039196
Change-Id: I74488677f1f5cddbd5391ddee24639a1673dad9b
2021-03-30 23:48:18 +00:00
Bob Badour
d476f90f74
[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine am: 7f34e59ce6 -s ours
...
am skip reason: skip tag Change-Id I41ef520b6e394a7708f453a706e6ef1a5f46c36a with SHA-1 376f47047c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14039196
Change-Id: I94333625aa4477be456a34a22649569f55b565fc
2021-03-30 23:13:56 +00:00
Bob Badour
7f34e59ce6
[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine
...
Added SPDX-license-identifier-Apache-2.0 legacy_by_exception_only to:
Android.bp
libwvdrmengine/Android.bp
libwvdrmengine/vts/vendor_module/Android.bp
Added legacy_by_exception_only to:
libwvdrmengine/cdm/Android.bp
libwvdrmengine/cdm/core/src/Android.bp
libwvdrmengine/cdm/core/test/Android.bp
libwvdrmengine/cdm/metrics/src/Android.bp
libwvdrmengine/cdm/test/integration-test.mk
libwvdrmengine/cdm/test/unit-test.mk
libwvdrmengine/level3/Android.bp
libwvdrmengine/mediacrypto/Android.bp
libwvdrmengine/mediacrypto/test/Android.mk
libwvdrmengine/mediadrm/Android.bp
libwvdrmengine/mediadrm/test/Android.mk
libwvdrmengine/oemcrypto/odk/Android.bp
libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
libwvdrmengine/oemcrypto/test/Android.mk
libwvdrmengine/test/unit/Android.mk
libwvdrmengine/tools/metrics_dump/Android.bp
Added SPDX-license-identifier-Apache-2.0 legacy_by_exception_only to:
libwvdrmengine/Android.mk
libwvdrmengine/vts/vendor_module/Android.mk
Added legacy_by_exception_only to:
libwvdrmengine/level3/arm/Android.mk
libwvdrmengine/level3/arm64/Android.mk
libwvdrmengine/level3/mips/Android.mk
libwvdrmengine/level3/mips64/Android.mk
libwvdrmengine/level3/x86/Android.mk
libwvdrmengine/level3/x86_64/Android.mk
libwvdrmengine/mediacrypto/Android.mk
libwvdrmengine/mediadrm/Android.mk
libwvdrmengine/oemcrypto/test/XtsTest.mk
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I41ef520b6e394a7708f453a706e6ef1a5f46c36a
Merged-in: I41ef520b6e394a7708f453a706e6ef1a5f46c36a
2021-03-30 09:26:30 -07:00
Cong Lin
882bdeb968
[automerger skipped] Refresh L3 builds for buffer overflow fixes on rvc-qpr-dev am: ce607283c1 am: 6a08cd3890 -s ours am: 4021ba6357
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13973686
Change-Id: I3b2d8302dfb84ee8003cce311013f31de944e7a0
2021-03-30 11:18:14 +00:00
Cong Lin
4021ba6357
[automerger skipped] Refresh L3 builds for buffer overflow fixes on rvc-qpr-dev am: ce607283c1 am: 6a08cd3890 -s ours
...
am skip reason: skipped by user robertshih
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13973686
Change-Id: I7f22588ac59b705197124860b42469ef904f64ed
2021-03-30 09:24:12 +00:00
Cong Lin
6a08cd3890
Refresh L3 builds for buffer overflow fixes on rvc-qpr-dev am: ce607283c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13973686
Change-Id: I398d987ae78d5f438d89894a2e41f51b5db6f8ce
2021-03-30 01:36:38 +00:00
Bob Badour
370fd82082
Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: ea0bd6030c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13998816
Change-Id: I93fec9892f4ad56a29370311bf7ffcc5543f8fa3
2021-03-26 07:27:49 +00:00
Bob Badour
ea0bd6030c
Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev
2021-03-26 06:45:39 +00:00
Alex Dale
0d2f61c5bd
Merge "Use new Base64 encode functions." into sc-dev am: 50757c84ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13972381
Change-Id: Ie87b5f5adb6b083c54e28c82fe599fc695ea044b
2021-03-26 05:44:23 +00:00
Alex Dale
5b5aebe551
Merge "Base64 encoding for string input." into sc-dev am: e189968a16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13972380
Change-Id: I54d7be8471881ab7070b9399a15c2dc4a10a6bda
2021-03-26 05:44:20 +00:00
Alex Dale
50757c84ec
Merge "Use new Base64 encode functions." into sc-dev
2021-03-26 05:19:31 +00:00
Alex Dale
e189968a16
Merge "Base64 encoding for string input." into sc-dev
2021-03-26 05:18:43 +00:00
Bob Badour
376f47047c
[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine
...
Added SPDX-license-identifier-Apache-2.0 legacy_by_exception_only to:
Android.bp
libwvdrmengine/Android.bp
libwvdrmengine/vts/vendor_module/Android.bp
Added legacy_by_exception_only to:
libwvdrmengine/cdm/Android.bp
libwvdrmengine/cdm/core/src/Android.bp
libwvdrmengine/cdm/core/test/Android.bp
libwvdrmengine/cdm/metrics/src/Android.bp
libwvdrmengine/cdm/test/integration-test.mk
libwvdrmengine/cdm/test/unit-test.mk
libwvdrmengine/level3/Android.bp
libwvdrmengine/mediacrypto/Android.bp
libwvdrmengine/mediacrypto/test/Android.mk
libwvdrmengine/mediadrm/Android.bp
libwvdrmengine/mediadrm/test/Android.mk
libwvdrmengine/oemcrypto/odk/Android.bp
libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
libwvdrmengine/oemcrypto/test/Android.mk
libwvdrmengine/test/unit/Android.mk
libwvdrmengine/tools/metrics_dump/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I41ef520b6e394a7708f453a706e6ef1a5f46c36a
2021-03-25 09:52:52 -07:00
Alex Dale
e4ee4eb404
Restructed reference root of trust (1/3 Keybox)
...
[ Merge of http://go/wvgerrit/115550 ]
This change is the first part of a three part change for restructing
the root of trust used by the reference implementation.
The API of the AuthenticationRoot class has been updated to reflect
the OEMCrypto functions that relate to the root of trust. This
involves changing the keybox and DRM Cert methods and adding in new
stubs for OEM Certificates.
The WvKeybox now uses a RAII-like interface to ensure that keyboxes
are provisioned correctly or not at all.
Bug: 135283522
Test: oemcrypto_unittests ce_cdm_tests
Change-Id: I3f2baf29c1022e1806b6196fa6650d761785c626
2021-03-24 19:14:17 -07:00
Rahul Frias
90cd0248d6
Merge "Have system clocks return wall time" into sc-dev am: 8c6ce2e4c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13944148
Change-Id: I19b578a1e90932a19b1dd0e94ddcd2b71c841322
2021-03-24 01:50:52 +00:00
Rahul Frias
8c6ce2e4c9
Merge "Have system clocks return wall time" into sc-dev
2021-03-24 01:23:19 +00:00
Rahul Frias
e729a53eff
Save and retrieve key information from licenses and usage records am: e538c96131
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13947818
Change-Id: I069e5654eba3be908815406d38e270f6188f86e5
2021-03-23 22:33:44 +00:00
Alex Dale
d859c1ab17
Use new Base64 encode functions.
...
[ Merge of http://go/wvgerrit/119806 ]
This change replaces all calls for base64 encoding which first converts
a string to a vector. The new base64 encoding function allow for
encoding binary data contained within strings.
Bug: 181732604
Test: Android unittests
Change-Id: Ibfe79dba99e6a2ee2f2a96e85b62fbd22519aea7
2021-03-23 14:49:58 -07:00
Alex Dale
e51f869190
Base64 encoding for string input.
...
[ Merge of http://go/wvgerrit/119805 ]
This change adds 3 new functions for encoding binary data from a C++
string to a base64 encoded ASCII string.
The CDM and protobuf generated code use C++ strings to store binary
data. These binary strings are commonly converted into a base64
encoded ASCII string for logging and for returning to the app.
This change also cleans up some of the internal components of the
string_conversions library to use several standard library C++11
method.
Bug: 181732604
Test: CE CDM unittests
Change-Id: I547568c6402e011344260f2df2a06e972122ab8a
2021-03-23 14:49:46 -07:00
Rahul Frias
e538c96131
Save and retrieve key information from licenses and usage records
...
[ Merge of http://go/wvgerrit/120512 ]
Wrapped DRM private keys are loaded when a key request is made or when
offline/usage sessions are restored. They were earlier loaded when a
session was opened.
For streaming sessions, key material will be fetched from the default
or legacy certificates and loaded when a key request is made.
For offline and usage sessions, key material may be retrieved from
license or usage records if available. If not available, information
associated with the legacy certificate will be loaded.
Certificate and wrapped keys are also written out when an offline
license or usage record is saved.
Bug: 169740403
Test: WV unit/integration tests
WvCdmRequestLicenseTest.ProvisioningWithExpiringCertTest
WvCdmRequestLicenseTest.StreamingWithExpiringCertTest
WvCdmRequestLicenseTest.RestoreOfflineKeysWithExpiringCertTest
Change-Id: Ice0154c632170c46da171cbbb23a97380c610a98
2021-03-23 13:06:55 -07:00
Cong Lin
ce607283c1
Refresh L3 builds for buffer overflow fixes on rvc-qpr-dev
...
Cherry-pick CL from wv master:
https://widevine-internal-review.git.corp.google.com/c/cdm/+/118363
Fixes included in this CL:
go/wvgerrit/111603
Fix L3 block offset test and re-enable buffer overflow tests
go/wvgerrit/111784
Fix heap overflow test in L3 and OEMCrypto ref
go/wvgerrit/113644
Check for buffer overflow when computing subsample size
go/wvgerrit/113946
Fix test failures caused by huge key length in L3
Bug: 180956067
Bug: 175001473
Bug: 175741683
Bug: 172866305
Bug: 175041667
Test: L3 unit test
Test: go/forrest https://android-build.googleplex.com/builds/tests/view?invocationId=I10900007766741431&testResultId=TR22818280880061022&redirect=http://sponge2/3c1fc176-f3bc-46e6-af7c-b2925ae3765b
Change-Id: Ied639d0639295aa6fade1d9ff3c6eab6a941b36d
2021-03-23 11:12:35 -07:00
Rahul Frias
4d1d7296d8
Add CLIENT_TOKEN_NOT_SET error code am: 30ebbefb40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13947817
Change-Id: Ibb78f0a98a32e17452f1082fcea9118f23129270
2021-03-23 04:09:52 +00:00
Rahul Frias
78b6b40343
Add certificate information to Usage Information am: 1aa197ce4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13937951
Change-Id: Ie8abef21cb159f0805fb753783f8acd1e198b342
2021-03-23 04:09:50 +00:00
Rahul Frias
30ebbefb40
Add CLIENT_TOKEN_NOT_SET error code
...
[ Merge of http://go/wvgerrit/120511 ]
Bug: 169740403
Test: WV unit/integration test
Change-Id: Iba77c0b7e7f1bee1e96b0d08f0ab8e8591292012
2021-03-22 17:08:34 -07:00
Rahul Frias
1aa197ce4a
Add certificate information to Usage Information
...
[ Merge of http://go/wvgerrit/120509 ]
Certificates and wrapped key material are stored in the usage information
file but apart from usage information records. Usage info records include
an identifier which indicates the associated certificate. Routines to
help with finding, inserting or removal of associated certificates have
been included. After a usage entry is deleted, a garbage collection
routine is run to remove any certificates not used by usage infomation
records.
Bug: 169740403
Test: WV unit/integration tests
Change-Id: I49075a7704a58c2488b73eb7c38b007958af566d
2021-03-22 17:07:25 -07:00
Rahul Frias
d492539c25
Merge changes Ic0de6328,Ic263f3df into sc-dev am: 335720be1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13925120
Change-Id: I225ba4182a2b37355e1105a6b4383f6c76786e1e
2021-03-22 21:00:04 +00:00
Alex Dale
d80f6b38b7
Merge "Sync Android reference with CDM reference." into sc-dev am: 8e090b47b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13635472
Change-Id: I21909ef6a32a42c60fa0fc8094e9a7e9183d6c1e
2021-03-22 20:59:51 +00:00
Rahul Frias
335720be1c
Merge changes Ic0de6328,Ic263f3df into sc-dev
...
* changes:
Add certificate information to offline licenses
Add comments to clarify client and service clock times
2021-03-22 20:23:52 +00:00
Alex Dale
8e090b47b8
Merge "Sync Android reference with CDM reference." into sc-dev
2021-03-22 20:22:42 +00:00
Rahul Frias
57ebb70fe7
Add certificate information to offline licenses
...
[ Merge of http://go/wvgerrit/120508 ]
Offline licenses will now store the DRM certificate information. This
allows for expired certificates to be deleted and replaced without
losing the ability to use offline licenses.
Bug: 169740403
Test: WV unit/integration tests
DeviceFilesTest.RetrieveLicenses
DeviceFilesTest.StoreLicenses
Change-Id: Ic0de6328d32e0000d1b58c81019e6c2227278cc4
2021-03-21 19:11:06 -07:00
Rahul Frias
f6b4d140f4
Add comments to clarify client and service clock times
...
[ Merge of http://go/wvgerrit/120510 ]
* Added some comments to clarify which clock times are computed at the
client and at the provisioning service. More detail is present in the
device_files.proto
* Moved helper methods |SetDeviceCertificate| and
|ExtractFromDeviceCertificate| from class methods to anonymous
namespace
* Removed some commented out code
Bug: 169740403
Test: WV unit/integration
Change-Id: Ic263f3dfe296fff6d9b5380b2e7c663d87022cb2
2021-03-21 14:40:12 -07:00