widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,943 Commits 2 Branches 0 Tags
ce36c11ee72ae1b4df8b409b23b7032e6fa6a34a
Commit Graph

4943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edwin Wong
ce36c11ee7 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: c82acab577 -s ours am: 4a55a10d16 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I49e00710652da5cdb765895f6e5281db5fb176e7
 2021-04-07 00:57:33 +00:00
Edwin Wong
4a55a10d16 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: c82acab577 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ibdf9f8c5c666c19075350805ea1fa44472e0c5eb
 2021-04-07 00:36:48 +00:00
Edwin Wong
c82acab577 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I9ffa3d2b096e62f92848ea103be82ecad48e6c08
 2021-04-06 23:52:20 +00:00
Edwin Wong
a423695ea0 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Id2b6c02ef85c826ce7b74b0a95797082b0845f5a
 2021-04-06 23:27:19 +00:00
Edwin Wong
605ae2e217 [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I1cb45d35088d149f02b0bb6c408e5fee3d79c1db
 2021-04-06 23:06:28 +00:00
Edwin Wong
12bb9a6463 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 am: 5a3544e7d2 -s ours am: fb4b95ecc3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ie460e2066bfad7d30b25412292f6d1c69d17a2d2
 2021-04-06 23:06:25 +00:00
Edwin Wong
d582a1fff3 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b am: 79b4677c6e -s ours am: 0ad236bd04 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ic2503cfe1f5f8fa5672d19a48e79dbf5d566a068
 2021-04-06 23:06:24 +00:00
Edwin Wong
fb4b95ecc3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 am: 5a3544e7d2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ibb0484bb0f7cf71b24ceb2adf74bd363e1fce376
 2021-04-06 22:49:37 +00:00
Edwin Wong
0ad236bd04 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b am: 79b4677c6e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Id3a5850cbb3b2e40d3034933f1a88b047839563d
 2021-04-06 22:49:36 +00:00
Edwin Wong
8da0803930 [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: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I1beb475350b3db047adbebf84d5d40920ef10b00
 2021-04-06 22:46:05 +00:00
Edwin Wong
5270c0457a [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours am: 73eb4c2e8c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I34fd96285b331e7c4a0f14a41ee0f361514e295b
 2021-04-06 22:46:03 +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
5a3544e7d2 Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ia58ef580baab3ef4a5a2f07e9c51f13fce7ffc4c
 2021-04-06 22:23:04 +00:00
Edwin Wong
79b4677c6e [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I9d84f4bc553f9c665d418734a9cf032bb4460a0c
 2021-04-06 22:23:03 +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
7b380179e8 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: Ifccf528b9a903082878f1492f03e3e232c797b96
 2021-04-06 21:49:15 +00:00
Edwin Wong
2c59c30f1b [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: Id08136edb62c110de282e66106ca096b19a757bb
 2021-04-06 21:49:14 +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
29359349ae [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: I520be5cfaceca14ae77cb8f202807fcffc612651
 2021-04-06 17:35:49 +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
2f7a64b8d3 [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: I1d1ba9c482bc917832b80ad1f7363087dcf780ad
 2021-04-06 05:44:27 +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
c10f719067 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: I4c2aadb7b98c48abc349582d0bca0ddb41d05df7
 2021-04-05 21:35:55 +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
1df93e5cae 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: Iebbb289b724e71fd1b7f8697120d3970dc591fca
 2021-03-31 03:02:39 +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
fccf162f9b [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: I1c010ebfed188a3476da504380e4b06a9171262b
 2021-03-30 23:49:31 +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
3c800963c1 [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: I0bcb116d1d7bdb64d58b7363e440ae2cd6e5446b
 2021-03-30 11:18:11 +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
000b7d9716 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: I0e802fea548cd498d3d0e2787caf4a49f0339687
 2021-03-26 07:01:24 +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
bb709bfd27 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: Iecee22009d4a0d56cf34133f83e44a5beab92747
 2021-03-26 05:36:21 +00:00
Alex Dale
fb651b1974 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: I44f3bac15846b260feb3620641293660066bd004
 2021-03-26 05:34:52 +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
43c7ac72b3 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: I02e6c1e5523512aa1c6b57082ec4d4b4ac1e5d3f
 2021-03-24 01:50:30 +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
e2d3826aff 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: I50878894d78ceeda6d134dca653b9e84c5311e09
 2021-03-23 22:32:51 +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