Skip to content

Commit dfa191d

Browse files
kevinAlbskevinAlbs
authored
CDRIVER-5541 bump required libmongocrypt to 1.11.0 (#1683)
* sync spec tests for new payloads sync from mongodb/specifications@458f80c * sync compact tests * bump required libmongocrypt to 1.11.0 * update NEWS
1 parent f2d97fb commit dfa191d

File tree

41 files changed

+339
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+339
-43
lines changed

‎.evergreen/scripts/compile-libmongocrypt.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ compile_libmongocrypt() {
1010
# `.evergreen/scripts/kms-divergence-check.sh` to ensure that there is no
1111
# divergence in the copied files.
1212

13-
# TODO: once 1.11.0 is released (containing MONGOCRYPT-698) replace the following with:
13+
# TODO: once 1.11.0 is released (containing MONGOCRYPT-705) replace the following with:
1414
# git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.11.0 || return
1515
{
1616
git clone -q https://github.com/mongodb/libmongocrypt || return
17-
# Check out commit containing MONGOCRYPT-698
18-
git -C libmongocrypt checkout 14ccd9ce8a030158aec07f63e8139d34b95d88e6
17+
# Check out commit containing MONGOCRYPT-705
18+
git -C libmongocrypt checkout bb12cda6504fecbf7a8ffc97d0cadc9cafbd1a29
1919
}
2020

2121
declare -a crypt_cmake_flags=(
2222
"-DMONGOCRYPT_MONGOC_DIR=${mongoc_dir}"
2323
"-DBUILD_TESTING=OFF"
2424
"-DENABLE_ONLINE_TESTS=OFF"
2525
"-DENABLE_MONGOC=OFF"
26-
"-DBUILD_VERSION=1.10.0-pre"
26+
"-DBUILD_VERSION=1.11.0-pre"
2727
)
2828

2929
DEBUG="0" \

‎NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
libmongoc 1.28.0 (unreleased)
22
=============================
33

4+
New features:
5+
6+
* Support In-Use Encryption range queries.
7+
48
Notes:
59

610
* Bump minimum wire protocol version from 6 (MongoDB 3.6) to 7 (MongoDB 4.0).
11+
* Raise required version of libmongocrypt to 1.11.0 to support In-Use Encryption (corresponds to the CMake option: `ENABLE_CLIENT_SIDE_ENCRYPTION`).
712

813
Changed:
914

‎src/libmongoc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@ elseif (NOT ENABLE_CLIENT_SIDE_ENCRYPTION STREQUAL OFF)
497497
find_package (mongocrypt QUIET)
498498
endif ()
499499

500-
if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.10.0)
500+
if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.11.0)
501501
message (STATUS " libmongocrypt found at ${mongocrypt_DIR}")
502502
message (STATUS " libmongocrypt version ${mongocrypt_VERSION} found")
503-
message (STATUS " libmongocrypt version 1.10.0 is required to enable In-Use Encryption Support.")
503+
message (STATUS " libmongocrypt version 1.11.0 is required to enable In-Use Encryption Support.")
504504
set (REQUIRED_MONGOCRYPT_VERSION_FOUND OFF)
505505
elseif (mongocrypt_FOUND)
506506
set (REQUIRED_MONGOCRYPT_VERSION_FOUND ON)

‎src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-Compact.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",
@@ -131,6 +130,9 @@
131130
"command": {
132131
"compactStructuredEncryptionData": "default"
133132
}
133+
},
134+
"result": {
135+
"ok": 1
134136
}
135137
}
136138
],

‎src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json

Lines changed: 289 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,289 @@
1+
{
2+
"runOn": [
3+
{
4+
"minServerVersion": "8.0.0",
5+
"topology": [
6+
"replicaset",
7+
"sharded",
8+
"load-balanced"
9+
]
10+
}
11+
],
12+
"database_name": "default",
13+
"collection_name": "default",
14+
"data": [],
15+
"encrypted_fields": {
16+
"fields": [
17+
{
18+
"keyId": {
19+
"$binary": {
20+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
21+
"subType": "04"
22+
}
23+
},
24+
"path": "encryptedInt",
25+
"bsonType": "int",
26+
"queries": {
27+
"queryType": "range",
28+
"contention": {
29+
"$numberLong": "0"
30+
},
31+
"trimFactor": {
32+
"$numberInt": "1"
33+
},
34+
"sparsity": {
35+
"$numberLong": "1"
36+
},
37+
"min": {
38+
"$numberInt": "0"
39+
},
40+
"max": {
41+
"$numberInt": "200"
42+
}
43+
}
44+
}
45+
]
46+
},
47+
"key_vault_data": [
48+
{
49+
"_id": {
50+
"$binary": {
51+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
52+
"subType": "04"
53+
}
54+
},
55+
"keyMaterial": {
56+
"$binary": {
57+
"base64": "sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==",
58+
"subType": "00"
59+
}
60+
},
61+
"creationDate": {
62+
"$date": {
63+
"$numberLong": "1648914851981"
64+
}
65+
},
66+
"updateDate": {
67+
"$date": {
68+
"$numberLong": "1648914851981"
69+
}
70+
},
71+
"status": {
72+
"$numberInt": "0"
73+
},
74+
"masterKey": {
75+
"provider": "local"
76+
}
77+
}
78+
],
79+
"tests": [
80+
{
81+
"description": "Compact works with 'range' fields",
82+
"clientOptions": {
83+
"autoEncryptOpts": {
84+
"kmsProviders": {
85+
"local": {
86+
"key": {
87+
"$binary": {
88+
"base64": "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk",
89+
"subType": "00"
90+
}
91+
}
92+
}
93+
}
94+
}
95+
},
96+
"operations": [
97+
{
98+
"name": "insertOne",
99+
"arguments": {
100+
"document": {
101+
"_id": 0,
102+
"encryptedInt": {
103+
"$numberInt": "0"
104+
}
105+
}
106+
}
107+
},
108+
{
109+
"name": "runCommand",
110+
"object": "database",
111+
"command_name": "compactStructuredEncryptionData",
112+
"arguments": {
113+
"command": {
114+
"compactStructuredEncryptionData": "default"
115+
}
116+
},
117+
"result": {
118+
"ok": 1
119+
}
120+
}
121+
],
122+
"expectations": [
123+
{
124+
"command_started_event": {
125+
"command": {
126+
"listCollections": 1,
127+
"filter": {
128+
"name": "default"
129+
}
130+
},
131+
"command_name": "listCollections"
132+
}
133+
},
134+
{
135+
"command_started_event": {
136+
"command": {
137+
"find": "datakeys",
138+
"filter": {
139+
"$or": [
140+
{
141+
"_id": {
142+
"$in": [
143+
{
144+
"$binary": {
145+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
146+
"subType": "04"
147+
}
148+
}
149+
]
150+
}
151+
},
152+
{
153+
"keyAltNames": {
154+
"$in": []
155+
}
156+
}
157+
]
158+
},
159+
"$db": "keyvault",
160+
"readConcern": {
161+
"level": "majority"
162+
}
163+
},
164+
"command_name": "find"
165+
}
166+
},
167+
{
168+
"command_started_event": {
169+
"command": {
170+
"insert": "default",
171+
"documents": [
172+
{
173+
"_id": 0,
174+
"encryptedInt": {
175+
"$$type": "binData"
176+
}
177+
}
178+
],
179+
"ordered": true,
180+
"encryptionInformation": {
181+
"type": 1,
182+
"schema": {
183+
"default.default": {
184+
"escCollection": "enxcol_.default.esc",
185+
"ecocCollection": "enxcol_.default.ecoc",
186+
"fields": [
187+
{
188+
"keyId": {
189+
"$binary": {
190+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
191+
"subType": "04"
192+
}
193+
},
194+
"path": "encryptedInt",
195+
"bsonType": "int",
196+
"queries": {
197+
"queryType": "range",
198+
"contention": {
199+
"$numberLong": "0"
200+
},
201+
"trimFactor": {
202+
"$numberInt": "1"
203+
},
204+
"sparsity": {
205+
"$numberLong": "1"
206+
},
207+
"min": {
208+
"$numberInt": "0"
209+
},
210+
"max": {
211+
"$numberInt": "200"
212+
}
213+
}
214+
}
215+
]
216+
}
217+
}
218+
}
219+
},
220+
"command_name": "insert"
221+
}
222+
},
223+
{
224+
"command_started_event": {
225+
"command": {
226+
"compactStructuredEncryptionData": "default",
227+
"compactionTokens": {
228+
"encryptedInt": {
229+
"ecoc": {
230+
"$binary": {
231+
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
232+
"subType": "00"
233+
}
234+
},
235+
"anchorPaddingToken": {
236+
"$binary": {
237+
"base64": "QxKJD2If48p0l8NAXf2Kr0aleMd/dATSjBK6hTpNMyc=",
238+
"subType": "00"
239+
}
240+
}
241+
}
242+
},
243+
"encryptionInformation": {
244+
"type": 1,
245+
"schema": {
246+
"default.default": {
247+
"escCollection": "enxcol_.default.esc",
248+
"ecocCollection": "enxcol_.default.ecoc",
249+
"fields": [
250+
{
251+
"keyId": {
252+
"$binary": {
253+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
254+
"subType": "04"
255+
}
256+
},
257+
"path": "encryptedInt",
258+
"bsonType": "int",
259+
"queries": {
260+
"queryType": "range",
261+
"contention": {
262+
"$numberLong": "0"
263+
},
264+
"trimFactor": {
265+
"$numberInt": "1"
266+
},
267+
"sparsity": {
268+
"$numberLong": "1"
269+
},
270+
"min": {
271+
"$numberInt": "0"
272+
},
273+
"max": {
274+
"$numberInt": "200"
275+
}
276+
}
277+
}
278+
]
279+
}
280+
}
281+
}
282+
},
283+
"command_name": "compactStructuredEncryptionData"
284+
}
285+
}
286+
]
287+
}
288+
]
289+
}

‎src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-Rangev2-Date-Aggregate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
"encryptedDate": {
329329
"$gt": {
330330
"$binary": {
331-
"base64": "DUkFAAADcGF5bG9hZAAZBQAABGcABQUAAAMwAH0AAAAFZAAgAAAAALGGQ/CRD+pGLD53BZzWcCcYbuGLVEyjzXIx7b+ux/q2BXMAIAAAAACOC6mXEZL27P9hethZbtKYsTXKK+FpgQ9Axxmn9N/cCwVsACAAAAAA+MFEd8XfZSpbXKqqPC2L3TEFswkaG5Ff6aSgf8p+XVIAAzEAfQAAAAVkACAAAAAAtL3QIvnZqCF72eS6lKr8ilff7R6kiNklokiTuaU5wNsFcwAgAAAAAEtqr3/X731VB+VrbFcY8ZrJKRo2E0Fd+C8L0EMNcvcCBWwAIAAAAABNPhSriux8W8qbwnhCczE3IzlhNEnGDpUwTFDZSL+eYQADMgB9AAAABWQAIAAAAAB99ZW/7KwXKzl5M3XQsAJ3JbEef90IoxFYBArNiYzlgQVzACAAAAAAYO/qaw0+92HAryxOUG7iK6hnIy3OaUA9jIqtHdvcq8YFbAAgAAAAAHrUYj8A0hVgc6VklpDiljOnykrUSfEsjm56XO/bsfKdAAMzAH0AAAAFZAAgAAAAAOK8brUuc2onBNDRtfYMR736dHj4dQqXod8JG7tAMTsDBXMAIAAAAAAW6SrGAL6Bx0s7ZlsYULFfOAiYIGhEWu6md3r+Rk40awVsACAAAAAAIHYXP8RLcCboUmHN3+OlnEw1DxaLSnbTB9PdF228fFAAAzQAfQAAAAVkACAAAAAAV22FGF7ZDwK/EYiGNMlm/QuT3saQdyJM/Fn+ZyQug1oFcwAgAAAAACo7GwCvbcs5UHQMgds9/1QMklEVdjZigpuOFGrDmmxtBWwAIAAAAADQbYYPxlCMMGe2MulbiurApFLoeJSMvTeDU3pyEA2jNwADNQB9AAAABWQAIAAAAADFspsMG7yHjKppyllon1KqAsTrHaZ6JzNqnSz8o6iTvwVzACAAAAAAeiA5pqVIQQ9s6UY/P8v5Jjkl3I7iFNeLDYehikrINrsFbAAgAAAAAFjBTzTpNxDEkA0vSRj0jCED9KDRlboMVyilKyDz5YR4AAM2AH0AAAAFZAAgAAAAAPcLmtq+V1e+MRlZ7NHq1+mrRVBQje5zj685ZvdsfKvSBXMAIAAAAABdHz/3w2k5km97QN9m7oLFYJaVJneNlMboIlz5yUASQAVsACAAAAAAWbp8JVJnx8fEVAJFa7WMfMa7wXeP5M3C8MX20J/i9n0AAzcAfQAAAAVkACAAAAAAYfLwnoxK6XAGQrJFy8+TIJoq38ldBaO75h4zA4ZX5tQFcwAgAAAAAC2wk8UcJH5X5XGnDBYmel6srpBkzBhHtt3Jw1u5TSJ1BWwAIAAAAAA9/YU9eI3D7QbXKIw/3/gzWJ6MZrCYhG0j1wNKgRQp5wADOAB9AAAABWQAIAAAAADGvyrtKkIcaV17ynZA7b2k5Pz6OhvxdWNkDvDWJIja8wVzACAAAAAAOLypVKNxf/wR1G8OZjUUsTQzDYeNNhhITxGMSp7euS4FbAAgAAAAAA9EsxoV1B2DcQ1NJRwuxXnvVR+vkD0wbbDYEI/zFEnDAAM5AH0AAAAFZAAgAAAAAEocREw1L0g+roFUchJI2Yd0M0ME2bnErNUYnpyJP1SqBXMAIAAAAAAcE2/JK/8MoSeOchIuAkKh1X3ImoA7p8ujAZIfvIDo6QVsACAAAAAA+W0+zgLr85/PD7P9a94wk6MgNgrizx/XU9aCxAkp1IwAABJjbQAAAAAAAAAAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgABAAAAAA==",
331+
"base64": "DXUFAAADcGF5bG9hZAAZBQAABGcABQUAAAMwAH0AAAAFZAAgAAAAALGGQ/CRD+pGLD53BZzWcCcYbuGLVEyjzXIx7b+ux/q2BXMAIAAAAACOC6mXEZL27P9hethZbtKYsTXKK+FpgQ9Axxmn9N/cCwVsACAAAAAA+MFEd8XfZSpbXKqqPC2L3TEFswkaG5Ff6aSgf8p+XVIAAzEAfQAAAAVkACAAAAAAtL3QIvnZqCF72eS6lKr8ilff7R6kiNklokiTuaU5wNsFcwAgAAAAAEtqr3/X731VB+VrbFcY8ZrJKRo2E0Fd+C8L0EMNcvcCBWwAIAAAAABNPhSriux8W8qbwnhCczE3IzlhNEnGDpUwTFDZSL+eYQADMgB9AAAABWQAIAAAAAB99ZW/7KwXKzl5M3XQsAJ3JbEef90IoxFYBArNiYzlgQVzACAAAAAAYO/qaw0+92HAryxOUG7iK6hnIy3OaUA9jIqtHdvcq8YFbAAgAAAAAHrUYj8A0hVgc6VklpDiljOnykrUSfEsjm56XO/bsfKdAAMzAH0AAAAFZAAgAAAAAOK8brUuc2onBNDRtfYMR736dHj4dQqXod8JG7tAMTsDBXMAIAAAAAAW6SrGAL6Bx0s7ZlsYULFfOAiYIGhEWu6md3r+Rk40awVsACAAAAAAIHYXP8RLcCboUmHN3+OlnEw1DxaLSnbTB9PdF228fFAAAzQAfQAAAAVkACAAAAAAV22FGF7ZDwK/EYiGNMlm/QuT3saQdyJM/Fn+ZyQug1oFcwAgAAAAACo7GwCvbcs5UHQMgds9/1QMklEVdjZigpuOFGrDmmxtBWwAIAAAAADQbYYPxlCMMGe2MulbiurApFLoeJSMvTeDU3pyEA2jNwADNQB9AAAABWQAIAAAAADFspsMG7yHjKppyllon1KqAsTrHaZ6JzNqnSz8o6iTvwVzACAAAAAAeiA5pqVIQQ9s6UY/P8v5Jjkl3I7iFNeLDYehikrINrsFbAAgAAAAAFjBTzTpNxDEkA0vSRj0jCED9KDRlboMVyilKyDz5YR4AAM2AH0AAAAFZAAgAAAAAPcLmtq+V1e+MRlZ7NHq1+mrRVBQje5zj685ZvdsfKvSBXMAIAAAAABdHz/3w2k5km97QN9m7oLFYJaVJneNlMboIlz5yUASQAVsACAAAAAAWbp8JVJnx8fEVAJFa7WMfMa7wXeP5M3C8MX20J/i9n0AAzcAfQAAAAVkACAAAAAAYfLwnoxK6XAGQrJFy8+TIJoq38ldBaO75h4zA4ZX5tQFcwAgAAAAAC2wk8UcJH5X5XGnDBYmel6srpBkzBhHtt3Jw1u5TSJ1BWwAIAAAAAA9/YU9eI3D7QbXKIw/3/gzWJ6MZrCYhG0j1wNKgRQp5wADOAB9AAAABWQAIAAAAADGvyrtKkIcaV17ynZA7b2k5Pz6OhvxdWNkDvDWJIja8wVzACAAAAAAOLypVKNxf/wR1G8OZjUUsTQzDYeNNhhITxGMSp7euS4FbAAgAAAAAA9EsxoV1B2DcQ1NJRwuxXnvVR+vkD0wbbDYEI/zFEnDAAM5AH0AAAAFZAAgAAAAAEocREw1L0g+roFUchJI2Yd0M0ME2bnErNUYnpyJP1SqBXMAIAAAAAAcE2/JK/8MoSeOchIuAkKh1X3ImoA7p8ujAZIfvIDo6QVsACAAAAAA+W0+zgLr85/PD7P9a94wk6MgNgrizx/XU9aCxAkp1IwAABJjbQAAAAAAAAAAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgABAAAAEnNwAAEAAAAAAAAAEHRmAAEAAAAJbW4AAAAAAAAAAAAJbXgAyAAAAAAAAAAA",
332332
"subType": "06"
333333
}
334334
}

‎src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-Rangev2-Date-Delete.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
"encryptedDate": {
318318
"$gt": {
319319
"$binary": {
320-
"base64": "DUkFAAADcGF5bG9hZAAZBQAABGcABQUAAAMwAH0AAAAFZAAgAAAAALGGQ/CRD+pGLD53BZzWcCcYbuGLVEyjzXIx7b+ux/q2BXMAIAAAAACOC6mXEZL27P9hethZbtKYsTXKK+FpgQ9Axxmn9N/cCwVsACAAAAAA+MFEd8XfZSpbXKqqPC2L3TEFswkaG5Ff6aSgf8p+XVIAAzEAfQAAAAVkACAAAAAAtL3QIvnZqCF72eS6lKr8ilff7R6kiNklokiTuaU5wNsFcwAgAAAAAEtqr3/X731VB+VrbFcY8ZrJKRo2E0Fd+C8L0EMNcvcCBWwAIAAAAABNPhSriux8W8qbwnhCczE3IzlhNEnGDpUwTFDZSL+eYQADMgB9AAAABWQAIAAAAAB99ZW/7KwXKzl5M3XQsAJ3JbEef90IoxFYBArNiYzlgQVzACAAAAAAYO/qaw0+92HAryxOUG7iK6hnIy3OaUA9jIqtHdvcq8YFbAAgAAAAAHrUYj8A0hVgc6VklpDiljOnykrUSfEsjm56XO/bsfKdAAMzAH0AAAAFZAAgAAAAAOK8brUuc2onBNDRtfYMR736dHj4dQqXod8JG7tAMTsDBXMAIAAAAAAW6SrGAL6Bx0s7ZlsYULFfOAiYIGhEWu6md3r+Rk40awVsACAAAAAAIHYXP8RLcCboUmHN3+OlnEw1DxaLSnbTB9PdF228fFAAAzQAfQAAAAVkACAAAAAAV22FGF7ZDwK/EYiGNMlm/QuT3saQdyJM/Fn+ZyQug1oFcwAgAAAAACo7GwCvbcs5UHQMgds9/1QMklEVdjZigpuOFGrDmmxtBWwAIAAAAADQbYYPxlCMMGe2MulbiurApFLoeJSMvTeDU3pyEA2jNwADNQB9AAAABWQAIAAAAADFspsMG7yHjKppyllon1KqAsTrHaZ6JzNqnSz8o6iTvwVzACAAAAAAeiA5pqVIQQ9s6UY/P8v5Jjkl3I7iFNeLDYehikrINrsFbAAgAAAAAFjBTzTpNxDEkA0vSRj0jCED9KDRlboMVyilKyDz5YR4AAM2AH0AAAAFZAAgAAAAAPcLmtq+V1e+MRlZ7NHq1+mrRVBQje5zj685ZvdsfKvSBXMAIAAAAABdHz/3w2k5km97QN9m7oLFYJaVJneNlMboIlz5yUASQAVsACAAAAAAWbp8JVJnx8fEVAJFa7WMfMa7wXeP5M3C8MX20J/i9n0AAzcAfQAAAAVkACAAAAAAYfLwnoxK6XAGQrJFy8+TIJoq38ldBaO75h4zA4ZX5tQFcwAgAAAAAC2wk8UcJH5X5XGnDBYmel6srpBkzBhHtt3Jw1u5TSJ1BWwAIAAAAAA9/YU9eI3D7QbXKIw/3/gzWJ6MZrCYhG0j1wNKgRQp5wADOAB9AAAABWQAIAAAAADGvyrtKkIcaV17ynZA7b2k5Pz6OhvxdWNkDvDWJIja8wVzACAAAAAAOLypVKNxf/wR1G8OZjUUsTQzDYeNNhhITxGMSp7euS4FbAAgAAAAAA9EsxoV1B2DcQ1NJRwuxXnvVR+vkD0wbbDYEI/zFEnDAAM5AH0AAAAFZAAgAAAAAEocREw1L0g+roFUchJI2Yd0M0ME2bnErNUYnpyJP1SqBXMAIAAAAAAcE2/JK/8MoSeOchIuAkKh1X3ImoA7p8ujAZIfvIDo6QVsACAAAAAA+W0+zgLr85/PD7P9a94wk6MgNgrizx/XU9aCxAkp1IwAABJjbQAAAAAAAAAAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgABAAAAAA==",
320+
"base64": "DXUFAAADcGF5bG9hZAAZBQAABGcABQUAAAMwAH0AAAAFZAAgAAAAALGGQ/CRD+pGLD53BZzWcCcYbuGLVEyjzXIx7b+ux/q2BXMAIAAAAACOC6mXEZL27P9hethZbtKYsTXKK+FpgQ9Axxmn9N/cCwVsACAAAAAA+MFEd8XfZSpbXKqqPC2L3TEFswkaG5Ff6aSgf8p+XVIAAzEAfQAAAAVkACAAAAAAtL3QIvnZqCF72eS6lKr8ilff7R6kiNklokiTuaU5wNsFcwAgAAAAAEtqr3/X731VB+VrbFcY8ZrJKRo2E0Fd+C8L0EMNcvcCBWwAIAAAAABNPhSriux8W8qbwnhCczE3IzlhNEnGDpUwTFDZSL+eYQADMgB9AAAABWQAIAAAAAB99ZW/7KwXKzl5M3XQsAJ3JbEef90IoxFYBArNiYzlgQVzACAAAAAAYO/qaw0+92HAryxOUG7iK6hnIy3OaUA9jIqtHdvcq8YFbAAgAAAAAHrUYj8A0hVgc6VklpDiljOnykrUSfEsjm56XO/bsfKdAAMzAH0AAAAFZAAgAAAAAOK8brUuc2onBNDRtfYMR736dHj4dQqXod8JG7tAMTsDBXMAIAAAAAAW6SrGAL6Bx0s7ZlsYULFfOAiYIGhEWu6md3r+Rk40awVsACAAAAAAIHYXP8RLcCboUmHN3+OlnEw1DxaLSnbTB9PdF228fFAAAzQAfQAAAAVkACAAAAAAV22FGF7ZDwK/EYiGNMlm/QuT3saQdyJM/Fn+ZyQug1oFcwAgAAAAACo7GwCvbcs5UHQMgds9/1QMklEVdjZigpuOFGrDmmxtBWwAIAAAAADQbYYPxlCMMGe2MulbiurApFLoeJSMvTeDU3pyEA2jNwADNQB9AAAABWQAIAAAAADFspsMG7yHjKppyllon1KqAsTrHaZ6JzNqnSz8o6iTvwVzACAAAAAAeiA5pqVIQQ9s6UY/P8v5Jjkl3I7iFNeLDYehikrINrsFbAAgAAAAAFjBTzTpNxDEkA0vSRj0jCED9KDRlboMVyilKyDz5YR4AAM2AH0AAAAFZAAgAAAAAPcLmtq+V1e+MRlZ7NHq1+mrRVBQje5zj685ZvdsfKvSBXMAIAAAAABdHz/3w2k5km97QN9m7oLFYJaVJneNlMboIlz5yUASQAVsACAAAAAAWbp8JVJnx8fEVAJFa7WMfMa7wXeP5M3C8MX20J/i9n0AAzcAfQAAAAVkACAAAAAAYfLwnoxK6XAGQrJFy8+TIJoq38ldBaO75h4zA4ZX5tQFcwAgAAAAAC2wk8UcJH5X5XGnDBYmel6srpBkzBhHtt3Jw1u5TSJ1BWwAIAAAAAA9/YU9eI3D7QbXKIw/3/gzWJ6MZrCYhG0j1wNKgRQp5wADOAB9AAAABWQAIAAAAADGvyrtKkIcaV17ynZA7b2k5Pz6OhvxdWNkDvDWJIja8wVzACAAAAAAOLypVKNxf/wR1G8OZjUUsTQzDYeNNhhITxGMSp7euS4FbAAgAAAAAA9EsxoV1B2DcQ1NJRwuxXnvVR+vkD0wbbDYEI/zFEnDAAM5AH0AAAAFZAAgAAAAAEocREw1L0g+roFUchJI2Yd0M0ME2bnErNUYnpyJP1SqBXMAIAAAAAAcE2/JK/8MoSeOchIuAkKh1X3ImoA7p8ujAZIfvIDo6QVsACAAAAAA+W0+zgLr85/PD7P9a94wk6MgNgrizx/XU9aCxAkp1IwAABJjbQAAAAAAAAAAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgABAAAAEnNwAAEAAAAAAAAAEHRmAAEAAAAJbW4AAAAAAAAAAAAJbXgAyAAAAAAAAAAA",
321321
"subType": "06"
322322
}
323323
}

0 commit comments

Comments
 (0)