aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-03-15 12:21:45 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-03-15 12:21:45 -0400
commit06049448d94cf8a73c43755e6b929b4f871e2cbd (patch)
treeedc1f98717452c7211091d34ef0521b00b82c8a6 /src
parent6ca6f4d9366b22d4f026723789dab19f99e5be44 (diff)
downloadcryptography-06049448d94cf8a73c43755e6b929b4f871e2cbd.tar.gz
cryptography-06049448d94cf8a73c43755e6b929b4f871e2cbd.tar.bz2
cryptography-06049448d94cf8a73c43755e6b929b4f871e2cbd.zip
Be on brand: it's macOS (#3456)
* Be on brand: it's macOS * line wrap
Diffstat (limited to 'src')
-rw-r--r--src/_cffi_src/utils.py2
-rw-r--r--src/cryptography/hazmat/backends/commoncrypto/backend.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/_cffi_src/utils.py b/src/_cffi_src/utils.py
index 00c8badb..3a4dd773 100644
--- a/src/_cffi_src/utils.py
+++ b/src/_cffi_src/utils.py
@@ -90,7 +90,7 @@ def extra_link_args(compiler_type):
def compiler_type():
"""
Gets the compiler type from distutils. On Windows with MSVC it will be
- "msvc". On OS X and linux it is "unix".
+ "msvc". On macOS and linux it is "unix".
"""
dist = Distribution()
dist.parse_config_files()
diff --git a/src/cryptography/hazmat/backends/commoncrypto/backend.py b/src/cryptography/hazmat/backends/commoncrypto/backend.py
index 838e5727..da78c9a1 100644
--- a/src/cryptography/hazmat/backends/commoncrypto/backend.py
+++ b/src/cryptography/hazmat/backends/commoncrypto/backend.py
@@ -104,7 +104,7 @@ class Backend(object):
return _HMACContext(self, key, algorithm)
def cipher_supported(self, cipher, mode):
- # In OS X 10.11.2-5 (as of this writing) CommonCrypto has a bug with
+ # In macOS 10.11.2-5 (as of this writing) CommonCrypto has a bug with
# Blowfish key lengths less than 64-bit. Filed as radar://26636600
if isinstance(cipher, Blowfish) and len(cipher.key) < 8:
return False