bytes

src/allmydata/crypto/util.py

@@ -17,8 +17,8 @@ def remove_prefix(s_bytes, prefix):
 
     :returns: `s_bytes` with `prefix` removed from the front.
     """
-    if not s_bytes.startswith(prefix):
-        raise BadPrefixError(
-            "did not see expected '{}' prefix".format(prefix)
-        )
-    return s_bytes[len(prefix):]
+    if s_bytes.startswith(prefix):
+        return s_bytes[len(prefix):]
+    raise BadPrefixError(
+        "did not see expected '{}' prefix".format(prefix)
+    )

src/allmydata/util/fileutil.py

@@ -111,7 +111,7 @@ class EncryptedTemporaryFile(object):
         iv = binascii.unhexlify("%032x" % offset_big)
         cipher = aes.create_encryptor(self.key, iv)
         # this is just to advance the counter
-        aes.encrypt_data(cipher, "\x00" * offset_small)
+        aes.encrypt_data(cipher, b"\x00" * offset_small)
         return aes.encrypt_data(cipher, data)
 
     def close(self):