Changeset 391 for python/trunk/Doc/library/hmac.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/hmac.rst (modified) (6 diffs)

python/trunk/Doc/library/hmac.rst

@@ -1 @@
-
 :mod:`hmac` --- Keyed-Hashing for Message Authentication
 ========================================================
@@ -11 +10 @@
 .. versionadded:: 2.2
 
+**Source code:** :source:`Lib/hmac.py`
+
+--------------
+
 This module implements the HMAC algorithm as described by :rfc:`2104`.
 
@@ -18 +21 @@
    Return a new hmac object.  If *msg* is present, the method call ``update(msg)``
    is made. *digestmod* is the digest constructor or module for the HMAC object to
-   use. It defaults to  the :func:`hashlib.md5` constructor.
+   use. It defaults to  the :data:`hashlib.md5` constructor.
 
-   .. note::
-
-      The md5 hash has known weaknesses but remains the default for backwards
-      compatibility. Choose a better one for your application.
 
 An HMAC object has the following methods:
 
-
-.. method:: hmac.update(msg)
+.. method:: HMAC.update(msg)
 
    Update the hmac object with the string *msg*.  Repeated calls are equivalent to
@@ -35 +33 @@
 
 
-.. method:: hmac.digest()
+.. method:: HMAC.digest()
 
    Return the digest of the strings passed to the :meth:`update` method so far.
@@ -42 +40 @@
 
 
-.. method:: hmac.hexdigest()
+.. method:: HMAC.hexdigest()
 
    Like :meth:`digest` except the digest is returned as a string twice the length
@@ -49 +47 @@
 
 
-.. method:: hmac.copy()
+.. method:: HMAC.copy()
 
    Return a copy ("clone") of the hmac object.  This can be used to efficiently