feat: update covercrypt to v12.0 (#35)

* feat: update covercrypt to v12.0

Author: Hugo Rosenkranz-Costa

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Features
 
 - Update to findex 5.0.0
+- Update to covercrypt 12.0.0
 - Support KMS v4.5.0 with tagging support
 
 ## [4.0.2] - 2023-07-17

pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 ]
 dependencies = [
   "cloudproof-anonymization >= 0.1.0, < 1.0.0",
-  "cover-crypt >= 11.0.0, < 12.0.0",
+  "cover-crypt >= 12.0.0, < 13.0.0",
   "findex >= 5.0.0, < 6.0.0",
   "cosmian-kms >= 4.5.0, < 5.0.0",
   "cloudproof-fpe >= 0.1.0, < 1.0.0",

src/cloudproof_py/cover_crypt/__init__.py

@@ -2,10 +2,10 @@
 from cloudproof_cover_crypt import (
     Attribute,
     CoverCrypt,
+    MasterPublicKey,
     MasterSecretKey,
     Policy,
     PolicyAxis,
-    PublicKey,
     SymmetricKey,
     UserSecretKey,
 )
@@ -17,6 +17,6 @@
     "CoverCrypt",
     "SymmetricKey",
     "MasterSecretKey",
-    "PublicKey",
+    "MasterPublicKey",
     "UserSecretKey",
 ]

src/cloudproof_py/kms/__init__.py

@@ -3,9 +3,9 @@
 
 from cloudproof_cover_crypt import (
     Attribute,
+    MasterPublicKey,
     MasterSecretKey,
     Policy,
-    PublicKey,
     UserSecretKey,
 )
 from cosmian_kms import KmsClient as InternalKmsClient
@@ -114,17 +114,17 @@ async def cover_crypt_decryption(
 
     async def retrieve_cover_crypt_public_master_key(
         self, public_key_identifier: str
-    ) -> PublicKey:
+    ) -> MasterPublicKey:
         """Fetch a CoverCrypt Public Master key.
 
         Args:
             public_key_identifier (str): the key unique identifier in the KMS
 
         Returns:
-            PublicKey
+            MasterPublicKey
         """
         object = await super().get_object(public_key_identifier)
-        return PublicKey.from_bytes(object.key_block())
+        return MasterPublicKey.from_bytes(object.key_block())
 
     async def retrieve_cover_crypt_private_master_key(
         self, master_secret_key_identifier: str

tests/non_regression_cover_crypt.py

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
+import argparse
 import json
-from base64 import b64encode, b64decode
-from typing import Union
 import os
-import argparse
+from base64 import b64decode, b64encode
+from typing import Union
 
 from cloudproof_py.cover_crypt import (
-    Policy,
-    PolicyAxis,
     CoverCrypt,
+    MasterPublicKey,
     MasterSecretKey,
-    PublicKey,
+    Policy,
+    PolicyAxis,
     UserSecretKey,
 )
 
@@ -40,7 +40,7 @@ def generate_user(
 
 def generate_ciphertext(
     instance: CoverCrypt,
-    public_key: PublicKey,
+    public_key: MasterPublicKey,
     policy: Policy,
     access_policy: str,
     plaintext: bytes,
@@ -183,7 +183,7 @@ def test_non_regression_vector(vector: dict) -> None:
     #
     Policy.from_bytes(b64decode(vector["policy"]))
     MasterSecretKey.from_bytes(b64decode(vector["master_secret_key"]))
-    PublicKey.from_bytes(b64decode(vector["public_key"]))
+    MasterPublicKey.from_bytes(b64decode(vector["public_key"]))
 
     #
     # Decrypt with top secret fin key

tests/test_cover_crypt.py

@@ -4,10 +4,10 @@
 from cloudproof_py.cover_crypt import (
     Attribute,
     CoverCrypt,
+    MasterPublicKey,
     MasterSecretKey,
     Policy,
     PolicyAxis,
-    PublicKey,
     UserSecretKey,
 )
 from cloudproof_py.kms import KmsClient
@@ -314,7 +314,7 @@ async def test_combined_kms_native(self) -> None:
         pubkey = await self.client.retrieve_cover_crypt_public_master_key(
             self.pubkey_uid
         )
-        self.assertIsInstance(pubkey, PublicKey)
+        self.assertIsInstance(pubkey, MasterPublicKey)
 
         # Retrieve private key
         privkey = await self.client.retrieve_cover_crypt_private_master_key(