sign/verify uses bytes instead of String

Author: daniel-sanche

kms/api-client/asymmetric.py

@@ -95,7 +95,7 @@ def signAsymmetric(message, client, key_path):
                     .asymmetricSign(name=key_path,
                                     body={'digest': digest_JSON})
     response = request.execute()
-    return response.get('signature', None)
+    return base64.b64decode(response.get('signature', None))
 # [END kms_sign_asymmetric]
 
 
@@ -106,13 +106,11 @@ def verifySignatureRSA(signature, message, client, key_path):
     specified message
     """
     public_key = getAsymmetricPublicKey(client, key_path)
-
     digest_bytes = hashlib.sha256(message).digest()
-    sig_bytes = base64.b64decode(signature)
 
     try:
         # Attempt verification
-        public_key.verify(sig_bytes,
+        public_key.verify(signature,
                           digest_bytes,
                           padding.PSS(mgf=padding.MGF1(hashes.SHA256()),
                                       salt_length=32),
@@ -131,13 +129,11 @@ def verifySignatureEC(signature, message, client, key_path):
     for the specified message
     """
     public_key = getAsymmetricPublicKey(client, key_path)
-
     digest_bytes = hashlib.sha256(message).digest()
-    sig_bytes = base64.b64decode(signature)
 
     try:
         # Attempt verification
-        public_key.verify(sig_bytes,
+        public_key.verify(signature,
                           digest_bytes,
                           ec.ECDSA(utils.Prehashed(hashes.SHA256())))
         # No errors were thrown. Verification was successful

kms/api-client/asymmetric_test.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import base64
 from os import environ
 from time import sleep
 
@@ -100,14 +99,13 @@ def test_get_public_key(self):
         assert isinstance(ec_key, _EllipticCurvePublicKey), 'expected EC key'
 
     def test_rsa_encrypt_decrypt(self):
-        ciphertext_bytes = sample.encryptRSA(self.message_bytes,
-                                             self.client,
-                                             self.rsaDecrypt)
-        ciphertext = base64.b64encode(ciphertext_bytes).decode()
-        # ciphertext should be 344 characters with base64 and RSA 2048
-        assert len(ciphertext) == 344, \
-            'ciphertext should be 344 chars; got {}'.format(len(ciphertext))
-        plaintext_bytes = sample.decryptRSA(ciphertext_bytes,
+        ciphertext = sample.encryptRSA(self.message_bytes,
+                                       self.client,
+                                       self.rsaDecrypt)
+        # ciphertext should be 256 characters with base64 and RSA 2048
+        assert len(ciphertext) == 256, \
+            'ciphertext should be 256 chars; got {}'.format(len(ciphertext))
+        plaintext_bytes = sample.decryptRSA(ciphertext,
                                             self.client,
                                             self.rsaDecrypt)
         assert plaintext_bytes == self.message_bytes
@@ -119,9 +117,8 @@ def test_rsa_sign_verify(self):
                                     self.client,
                                     self.rsaSign)
         # ciphertext should be 344 characters with base64 and RSA 2048
-        assert len(sig) == 344, \
-            'sig should be 344 chars; got {}'.format(len(sig))
-        assert sig[-2:] == '==', 'sig should end with =='
+        assert len(sig) == 256, \
+            'sig should be 256 chars; got {}'.format(len(sig))
         success = sample.verifySignatureRSA(sig,
                                             self.message_bytes,
                                             self.client,