aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-04-26 18:19:57 -0400
committerGitHub <noreply@github.com>2020-04-26 17:19:57 -0500
commit7dcd284c6e586aa0658016902be7eb612dacb7cb (patch)
tree99c265d34d6a66a211a78a16c79903cdbb8114a6
parent12e85b59165da0c05270e8db84941b18291220db (diff)
downloadcryptography-7dcd284c6e586aa0658016902be7eb612dacb7cb.tar.gz
cryptography-7dcd284c6e586aa0658016902be7eb612dacb7cb.tar.bz2
cryptography-7dcd284c6e586aa0658016902be7eb612dacb7cb.zip
Remove dead constant time code (#5239)
-rw-r--r--setup.py1
-rw-r--r--src/_cffi_src/build_constant_time.py27
-rw-r--r--src/_cffi_src/hazmat_src/constant_time.c22
-rw-r--r--src/_cffi_src/hazmat_src/constant_time.h6
4 files changed, 0 insertions, 56 deletions
diff --git a/setup.py b/setup.py
index a5bbfa1e..e82464aa 100644
--- a/setup.py
+++ b/setup.py
@@ -148,7 +148,6 @@ def keywords_with_side_effects(argv):
else:
cffi_modules = [
"src/_cffi_src/build_openssl.py:ffi",
- "src/_cffi_src/build_constant_time.py:ffi",
"src/_cffi_src/build_padding.py:ffi",
]
diff --git a/src/_cffi_src/build_constant_time.py b/src/_cffi_src/build_constant_time.py
deleted file mode 100644
index 7a11f7b5..00000000
--- a/src/_cffi_src/build_constant_time.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-from __future__ import absolute_import, division, print_function
-
-import os
-
-from _cffi_src.utils import build_ffi, compiler_type, extra_link_args
-
-
-with open(os.path.join(
- os.path.dirname(__file__), "hazmat_src/constant_time.h"
-)) as f:
- types = f.read()
-
-with open(os.path.join(
- os.path.dirname(__file__), "hazmat_src/constant_time.c"
-)) as f:
- functions = f.read()
-
-ffi = build_ffi(
- module_name="_constant_time",
- cdef_source=types,
- verify_source=functions,
- extra_link_args=extra_link_args(compiler_type()),
-)
diff --git a/src/_cffi_src/hazmat_src/constant_time.c b/src/_cffi_src/hazmat_src/constant_time.c
deleted file mode 100644
index 0a48fe83..00000000
--- a/src/_cffi_src/hazmat_src/constant_time.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// This file is dual licensed under the terms of the Apache License, Version
-// 2.0, and the BSD License. See the LICENSE file in the root of this
-// repository for complete details.
-
-uint8_t Cryptography_constant_time_bytes_eq(uint8_t *a, size_t len_a,
- uint8_t *b, size_t len_b) {
- size_t i = 0;
- uint8_t mismatch = 0;
- if (len_a != len_b) {
- return 0;
- }
- for (i = 0; i < len_a; i++) {
- mismatch |= a[i] ^ b[i];
- }
-
- /* Make sure any bits set are copied to the lowest bit */
- mismatch |= mismatch >> 4;
- mismatch |= mismatch >> 2;
- mismatch |= mismatch >> 1;
- /* Now check the low bit to see if it's set */
- return (mismatch & 1) == 0;
-}
diff --git a/src/_cffi_src/hazmat_src/constant_time.h b/src/_cffi_src/hazmat_src/constant_time.h
deleted file mode 100644
index 593479f6..00000000
--- a/src/_cffi_src/hazmat_src/constant_time.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is dual licensed under the terms of the Apache License, Version
-// 2.0, and the BSD License. See the LICENSE file in the root of this
-// repository for complete details.
-
-uint8_t Cryptography_constant_time_bytes_eq(uint8_t *, size_t, uint8_t *,
- size_t);