summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-09-11 12:36:35 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-09-11 11:36:35 -0500
commit239e2d30f2053386e85114f9d3bc5fe0d9042a18 (patch)
treee4a6f871b6d0eca38633d767da5224b7595ee7ea
parent643aab8ec876854e936971aac4e373cd5c377f24 (diff)
downloadpyopenssl-git-239e2d30f2053386e85114f9d3bc5fe0d9042a18.tar.gz
Nudge people towards better hashes in a few places (#538)
-rw-r--r--doc/api/crypto.rst4
-rw-r--r--src/OpenSSL/crypto.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/crypto.rst b/doc/api/crypto.rst
index 6276bc2..cac9dd9 100644
--- a/doc/api/crypto.rst
+++ b/doc/api/crypto.rst
@@ -127,7 +127,7 @@ Signing and verifying signatures
*key* is a :py:class:`PKey` instance. *data* is a ``str`` instance.
*digest* is a ``str`` naming a supported message digest type, for example
- :py:const:`sha1`.
+ :py:const:`b"sha256"`.
.. versionadded:: 0.11
@@ -140,7 +140,7 @@ Signing and verifying signatures
key which generated the signature. *signature* is a *str* instance giving
the signature itself. *data* is a *str* instance giving the data to which
the signature applies. *digest* is a *str* instance naming the message
- digest type of the signature, for example :py:const:`sha1`.
+ digest type of the signature, for example :py:const:`b"sha256"`.
.. versionadded:: 0.11
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
index 116cc51..84a1a07 100644
--- a/src/OpenSSL/crypto.py
+++ b/src/OpenSSL/crypto.py
@@ -937,7 +937,7 @@ class X509Req(object):
:param pkey: The key pair to sign with.
:type pkey: :py:class:`PKey`
:param digest: The name of the message digest to use for the signature,
- e.g. :py:data:`b"sha1"`.
+ e.g. :py:data:`b"sha256"`.
:type digest: :py:class:`bytes`
:return: ``None``
"""
@@ -2071,7 +2071,7 @@ class CRL(object):
:data:`FILETYPE_ASN1`, or :data:`FILETYPE_TEXT`.
:param int days: The number of days until the next update of this CRL.
:param bytes digest: The name of the message digest to use (eg
- ``b"sha1"``).
+ ``b"sha2566"``).
:rtype: bytes
"""