Skip to content

Commit c99a856

Browse files
authored
PHPC-2093: Key Management API (#1339)
* PHPC-2120: Bump libmongoc 1.22.1 and libmongocrypt 1.5.2 * Clean keyvault collection before CSFLE tests * Test invalid keyMaterial option for ClientEncryption::createDataKey() * ClientEncryption::createDataKey() "keyMaterial" option * ClientEncryption key management methods Use ClientEncryption::getKey in createDataKey tests * Require server 4.2+ for CSFLE integration tests * Accommodate PHP 7.2 error message in createDataKey error test
1 parent 104b2f8 commit c99a856

Some content is hidden

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

45 files changed

+1526
-135
lines changed

src/BSON/Binary.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright 2022-present MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
#ifndef PHONGO_BSON_BINARY_H
18+
#define PHONGO_BSON_BINARY_H
19+
20+
#define PHONGO_BINARY_UUID_SIZE 16
21+
22+
#endif /* PHONGO_BSON_BINARY_H */

src/LIBMONGOCRYPT_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0
1+
1.5.2

src/LIBMONGOC_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.0
1+
1.22.1

0 commit comments

Comments
 (0)