diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-08 09:51:24 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-08 09:51:24 -0700 |
| commit | 38b11cc978c9b1eacc5c1902628a9542ad5f104f (patch) | |
| tree | 816297750f737579234a322534a3a997386a9251 /docs | |
| parent | e0e9541322cd9186d62f0d807efd77b3467b3ad3 (diff) | |
| parent | e9d027a99b7b945e4254e2ddd407c34d500cd22d (diff) | |
| download | cryptography-38b11cc978c9b1eacc5c1902628a9542ad5f104f.tar.gz cryptography-38b11cc978c9b1eacc5c1902628a9542ad5f104f.tar.bz2 cryptography-38b11cc978c9b1eacc5c1902628a9542ad5f104f.zip | |
Merge branch 'master' into pem-loading-backend
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/mac/index.rst | 2 | ||||
| -rw-r--r-- | docs/installation.rst | 1 | ||||
| -rw-r--r-- | docs/spelling_wordlist.txt | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/mac/index.rst b/docs/hazmat/primitives/mac/index.rst index acfe9bed..bc54bae4 100644 --- a/docs/hazmat/primitives/mac/index.rst +++ b/docs/hazmat/primitives/mac/index.rst @@ -1,6 +1,6 @@ .. hazmat:: -Message Authentication Codes +Message authentication codes ============================ While cryptography supports both the CMAC and HMAC algorithms, we strongly diff --git a/docs/installation.rst b/docs/installation.rst index 6b8bb219..76f0439a 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -28,6 +28,7 @@ OpenSSL releases: * ``OpenSSL 0.9.8y`` * ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``) * ``OpenSSL 1.0.1`` +* ``OpenSSL 1.0.1e-fips`` (``RHEL/CentOS 7``) * ``OpenSSL 1.0.1e-freebsd`` * ``OpenSSL 1.0.1h`` * ``OpenSSL 1.0.2 beta`` diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index d90547a8..b16026f6 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -38,8 +38,10 @@ plaintext preprocessor preprocessors pseudorandom +pyOpenSSL Schneier scrypt +Solaris Tanja testability Ubuntu |