From d5244fa21e9288d61dda9bbfff7579696e6677a7 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Tue, 18 Feb 2014 14:56:27 +0800
Subject: Added TOTP implementation and tests.

---
 cryptography/hazmat/primitives/twofactor/hotp.py | 15 ++++--
 cryptography/hazmat/primitives/twofactor/totp.py | 33 ++++++++++++++
 tests/hazmat/primitives/twofactor/test_hotp.py   | 21 ++++++---
 tests/hazmat/primitives/twofactor/test_totp.py   | 58 ++++++++++++++++++++++++
 4 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 cryptography/hazmat/primitives/twofactor/totp.py
 create mode 100644 tests/hazmat/primitives/twofactor/test_totp.py

diff --git a/cryptography/hazmat/primitives/twofactor/hotp.py b/cryptography/hazmat/primitives/twofactor/hotp.py
index 80e28820..a6b01b5b 100644
--- a/cryptography/hazmat/primitives/twofactor/hotp.py
+++ b/cryptography/hazmat/primitives/twofactor/hotp.py
@@ -17,13 +17,13 @@ import struct
 
 import six
 
-from cryptography.exceptions import InvalidToken
+from cryptography.exceptions import InvalidToken, UnsupportedAlgorithm
 from cryptography.hazmat.primitives import constant_time, hmac
-from cryptography.hazmat.primitives.hashes import SHA1
+from cryptography.hazmat.primitives.hashes import SHA1, SHA256, SHA512
 
 
 class HOTP(object):
-    def __init__(self, key, length, backend):
+    def __init__(self, key, length, algorithm, backend):
 
         if len(key) < 16:
             raise ValueError("Key length has to be at least 128 bits.")
@@ -31,8 +31,13 @@ class HOTP(object):
         if length < 6 or length > 8:
             raise ValueError("Length of HOTP has to be between 6 to 8.")
 
+        if not isinstance(algorithm, (SHA1, SHA256, SHA512)):
+            raise UnsupportedAlgorithm(
+                "Algorithm must be SHA1, SHA256 or SHA512")
+
         self._key = key
         self._length = length
+        self._algorithm = algorithm
         self._backend = backend
 
     def generate(self, counter):
@@ -45,11 +50,11 @@ class HOTP(object):
             raise InvalidToken("Supplied HOTP value does not match")
 
     def _dynamic_truncate(self, counter):
-        ctx = hmac.HMAC(self._key, SHA1(), self._backend)
+        ctx = hmac.HMAC(self._key, self._algorithm, self._backend)
         ctx.update(struct.pack(">Q", counter))
         hmac_value = ctx.finalize()
 
-        offset_bits = six.indexbytes(hmac_value, 19) & 0b1111
+        offset_bits = six.indexbytes(hmac_value, len(hmac_value)-1) & 0b1111
 
         offset = int(offset_bits)
         p = hmac_value[offset:offset + 4]
diff --git a/cryptography/hazmat/primitives/twofactor/totp.py b/cryptography/hazmat/primitives/twofactor/totp.py
new file mode 100644
index 00000000..c9933d30
--- /dev/null
+++ b/cryptography/hazmat/primitives/twofactor/totp.py
@@ -0,0 +1,33 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import math
+
+from cryptography.exceptions import InvalidToken
+from cryptography.hazmat.primitives import constant_time
+from cryptography.hazmat.primitives.twofactor.hotp import HOTP
+
+
+class TOTP(object):
+    def __init__(self, key, length, algorithm, time_step, backend):
+
+        self._time_step = time_step
+        self.hotp = HOTP(key, length, algorithm, backend)
+
+    def generate(self, time):
+        counter = int(math.floor(time/self._time_step))
+        return self.hotp.generate(counter)
+
+    def verify(self, totp, time):
+        if not constant_time.bytes_eq(self.generate(time), totp):
+            raise InvalidToken("Supplied HOTP value does not match")
diff --git a/tests/hazmat/primitives/twofactor/test_hotp.py b/tests/hazmat/primitives/twofactor/test_hotp.py
index ec619b55..8f687ebb 100644
--- a/tests/hazmat/primitives/twofactor/test_hotp.py
+++ b/tests/hazmat/primitives/twofactor/test_hotp.py
@@ -15,10 +15,11 @@ import os
 
 import pytest
 
-from cryptography.exceptions import InvalidToken
+from cryptography.exceptions import InvalidToken, UnsupportedAlgorithm
 from cryptography.hazmat.primitives.twofactor.hotp import HOTP
 from cryptography.hazmat.primitives import hashes
 from tests.utils import load_vectors_from_file, load_nist_vectors
+from cryptography.hazmat.primitives.hashes import MD5, SHA1
 
 vectors = load_vectors_from_file(
     "twofactor/rfc-4226.txt", load_nist_vectors)
@@ -35,13 +36,19 @@ class TestHOTP(object):
         secret = os.urandom(10)
 
         with pytest.raises(ValueError):
-            HOTP(secret, 6, backend)
+            HOTP(secret, 6, SHA1(), backend)
 
     def test_invalid_hotp_length(self, backend):
         secret = os.urandom(16)
 
         with pytest.raises(ValueError):
-            HOTP(secret, 4, backend)
+            HOTP(secret, 4, SHA1(), backend)
+
+    def test_invalid_algorithm(self, backend):
+        secret = os.urandom(16)
+
+        with pytest.raises(UnsupportedAlgorithm):
+            HOTP(secret, 6, MD5(), backend)
 
     @pytest.mark.parametrize("params", vectors)
     def test_truncate(self, backend, params):
@@ -49,7 +56,7 @@ class TestHOTP(object):
         counter = int(params["counter"])
         truncated = params["truncated"]
 
-        hotp = HOTP(secret, 6, backend)
+        hotp = HOTP(secret, 6, SHA1(), backend)
 
         assert hotp._dynamic_truncate(counter) == int(truncated.decode(), 16)
 
@@ -59,7 +66,7 @@ class TestHOTP(object):
         counter = int(params["counter"])
         hotp_value = params["hotp"]
 
-        hotp = HOTP(secret, 6, backend)
+        hotp = HOTP(secret, 6, SHA1(), backend)
 
         assert hotp.generate(counter) == hotp_value
 
@@ -69,7 +76,7 @@ class TestHOTP(object):
         counter = int(params["counter"])
         hotp_value = params["hotp"]
 
-        hotp = HOTP(secret, 6, backend)
+        hotp = HOTP(secret, 6, SHA1(), backend)
 
         assert hotp.verify(hotp_value, counter) is None
 
@@ -77,7 +84,7 @@ class TestHOTP(object):
         secret = b"12345678901234567890"
         counter = 0
 
-        hotp = HOTP(secret, 6, backend)
+        hotp = HOTP(secret, 6, SHA1(), backend)
 
         with pytest.raises(InvalidToken):
             hotp.verify(b"123456", counter)
diff --git a/tests/hazmat/primitives/twofactor/test_totp.py b/tests/hazmat/primitives/twofactor/test_totp.py
new file mode 100644
index 00000000..0549fa59
--- /dev/null
+++ b/tests/hazmat/primitives/twofactor/test_totp.py
@@ -0,0 +1,58 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+
+from cryptography.exceptions import InvalidToken
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.hashes import SHA1
+from cryptography.hazmat.primitives.twofactor.totp import TOTP
+from tests.utils import load_vectors_from_file, load_nist_vectors
+
+vectors = load_vectors_from_file(
+    "twofactor/rfc-6238.txt", load_nist_vectors)
+
+@pytest.mark.hmac
+class TestTOTP(object):
+
+    @pytest.mark.parametrize("params", vectors)
+    def test_generate(self, backend, params):
+        secret = params["secret"]
+        time = int(params["time"])
+        mode = params["mode"]
+        totp_value = params["totp"]
+
+        algorithm = getattr(hashes, mode.decode())
+        totp = TOTP(secret, 8, algorithm(), 30, backend)
+        assert totp.generate(time) == totp_value
+
+    @pytest.mark.parametrize("params", vectors)
+    def test_verify(self, backend, params):
+        secret = params["secret"]
+        time = int(params["time"])
+        mode = params["mode"]
+        totp_value = params["totp"]
+
+        algorithm = getattr(hashes, mode.decode())
+        totp = TOTP(secret, 8, algorithm(), 30, backend)
+
+        assert totp.verify(totp_value, time) is None
+
+    def test_invalid_verify(self, backend):
+            secret = b"12345678901234567890"
+            time = 59
+
+            totp = TOTP(secret, 8, SHA1(), 30, backend)
+
+            with pytest.raises(InvalidToken):
+                totp.verify(b"12345678", time)
-- 
cgit v1.2.3


From 7ea36ed7b7ae6b608d35dfea06aff8ca974940f2 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Tue, 18 Feb 2014 15:22:52 +0800
Subject: Added documentation for TOTP.

---
 docs/hazmat/primitives/twofactor.rst           | 65 ++++++++++++++++++++++----
 tests/hazmat/primitives/twofactor/test_totp.py |  1 +
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 9d661612..12277c8f 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -13,13 +13,13 @@ codes (HMAC).
 
 .. currentmodule:: cryptography.hazmat.primitives.twofactor.hotp
 
-.. class:: HOTP(key, length, backend)
+.. class:: HOTP(key, length, algorithm, backend)
 
     .. versionadded:: 0.3
 
-    HOTP objects take a ``key`` and ``length`` parameter. The ``key``
-    should be randomly generated bytes and is recommended to be 160 bits in
-    length. The ``length`` parameter controls the length of the generated
+    HOTP objects take a ``key``, ``length`` and ``algorithm`` parameter. The
+    ``key`` should be randomly generated bytes and is recommended to be 160
+    bits in length. The ``length`` parameter controls the length of the generated
     one time password and must be >= 6 and <= 8.
 
     This is an implementation of :rfc:`4226`.
@@ -29,9 +29,9 @@ codes (HMAC).
         >>> import os
         >>> from cryptography.hazmat.backends import default_backend
         >>> from cryptography.hazmat.primitives.twofactor.hotp import HOTP
-
+        >>> from cryptography.hazmat.primitives.hashes import SHA1
         >>> key = b"12345678901234567890"
-        >>> hotp = HOTP(key, 6, backend=default_backend())
+        >>> hotp = HOTP(key, 6, SHA1(), backend=default_backend())
         >>> hotp.generate(0)
         '755224'
         >>> hotp.verify(b"755224", 0)
@@ -40,12 +40,16 @@ codes (HMAC).
                       cryptographically secure fashion and be at least 128 bits.
                       It is recommended that the key be 160 bits.
     :param int length: Length of generated one time password as ``int``.
+    :param algorithm: A
+        :class:`~cryptography.hazmat.primitives.hashes`
+        provider.
     :param backend: A
         :class:`~cryptography.hazmat.backends.interfaces.HMACBackend`
         provider.
     :raises ValueError: This is raised if the provided ``key`` is shorter 128 bits
                         or if the ``length`` parameter is not between 6 to 8.
-
+    :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
+                                  ``SHA1()``, ``SHA256()`` or ``SHA512()``.
 
     .. method:: generate(counter)
 
@@ -60,7 +64,7 @@ codes (HMAC).
                                                       does not match the expected HOTP.
 
 Throttling
-----------
+~~~~~~~~~~
 
 Due to the fact that the HOTP algorithm generates rather short tokens that are 6 - 8 digits
 long, brute force attacks are possible. It is highly recommended that the server that
@@ -69,7 +73,7 @@ time after a number of failed attempts. The number of allowed attempts should be
 possible while still ensuring that usability is not significantly impacted.
 
 Re-synchronization of the Counter
----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The server's counter value should only be incremented on a successful HOTP authentication.
 However, the counter on the client is incremented every time a new HOTP value is requested.
@@ -93,4 +97,45 @@ This can be accomplished with something similar to the following code.
             except InvalidToken:
                 pass
 
-        return correct_counter
\ No newline at end of file
+        return correct_counter
+
+.. currentmodule:: cryptography.hazmat.primitives.twofactor.totp
+
+.. class:: TOTP(key, length, algorithm, time_step, backend)
+
+    TOTP objects take a ``key``, ``length``, ``algorithm`` and ``time_step``
+    parameter. The ``key`` should be randomly generated bytes and is recommended
+    to be 160 bits in length. The ``length`` parameter controls the length of the
+    generated one time password and must be >= 6 and <= 8.
+
+    This is an implementation of :rfc:`6238`.
+
+    .. doctest::
+
+        >>> import os
+        >>> from cryptography.hazmat.backends import default_backend
+        >>> from cryptography.hazmat.primitives.twofactor.totp import TOTP
+        >>> from cryptography.hazmat.primitives.hashes import SHA1
+        >>> key = b"12345678901234567890"
+        >>> totp = TOTP(key, 8, SHA1(), 30, backend=default_backend())
+        >>> totp.generate(59)
+        '94287082'
+        >>> totp.verify(b"94287082", 59)
+
+    :param bytes key: Secret key as ``bytes``. This value must be generated in a
+                      cryptographically secure fashion and be at least 128 bits.
+                      It is recommended that the key be 160 bits.
+    :param int length: Length of generated one time password as ``int``.
+    :param algorithm: A
+        :class:`~cryptography.hazmat.primitives.hashes`
+        provider.
+    :param int time_step: The time step size. The default should be 30.
+    :param backend: A
+        :class:`~cryptography.hazmat.backends.interfaces.HMACBackend`
+        provider.
+    :raises ValueError: This is raised if the provided ``key`` is shorter 128 bits
+                        or if the ``length`` parameter is not between 6 to 8.
+    :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
+                                  ``SHA1()``, ``SHA256()`` or ``SHA512()``.
+
+
diff --git a/tests/hazmat/primitives/twofactor/test_totp.py b/tests/hazmat/primitives/twofactor/test_totp.py
index 0549fa59..ea18a40c 100644
--- a/tests/hazmat/primitives/twofactor/test_totp.py
+++ b/tests/hazmat/primitives/twofactor/test_totp.py
@@ -22,6 +22,7 @@ from tests.utils import load_vectors_from_file, load_nist_vectors
 vectors = load_vectors_from_file(
     "twofactor/rfc-6238.txt", load_nist_vectors)
 
+
 @pytest.mark.hmac
 class TestTOTP(object):
 
-- 
cgit v1.2.3


From f39716de33ad0b387f829bc111c8490d57ad6cf6 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Fri, 21 Feb 2014 14:38:30 +0800
Subject: Small fixes

---
 cryptography/hazmat/primitives/twofactor/totp.py | 10 ++++------
 docs/hazmat/primitives/twofactor.rst             | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cryptography/hazmat/primitives/twofactor/totp.py b/cryptography/hazmat/primitives/twofactor/totp.py
index c9933d30..79752f3b 100644
--- a/cryptography/hazmat/primitives/twofactor/totp.py
+++ b/cryptography/hazmat/primitives/twofactor/totp.py
@@ -11,8 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import math
-
 from cryptography.exceptions import InvalidToken
 from cryptography.hazmat.primitives import constant_time
 from cryptography.hazmat.primitives.twofactor.hotp import HOTP
@@ -22,12 +20,12 @@ class TOTP(object):
     def __init__(self, key, length, algorithm, time_step, backend):
 
         self._time_step = time_step
-        self.hotp = HOTP(key, length, algorithm, backend)
+        self._hotp = HOTP(key, length, algorithm, backend)
 
     def generate(self, time):
-        counter = int(math.floor(time/self._time_step))
-        return self.hotp.generate(counter)
+        counter = int(time/self._time_step)
+        return self._hotp.generate(counter)
 
     def verify(self, totp, time):
         if not constant_time.bytes_eq(self.generate(time), totp):
-            raise InvalidToken("Supplied HOTP value does not match")
+            raise InvalidToken("Supplied TOTP value does not match")
diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 12277c8f..120beb06 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -105,8 +105,9 @@ This can be accomplished with something similar to the following code.
 
     TOTP objects take a ``key``, ``length``, ``algorithm`` and ``time_step``
     parameter. The ``key`` should be randomly generated bytes and is recommended
-    to be 160 bits in length. The ``length`` parameter controls the length of the
-    generated one time password and must be >= 6 and <= 8.
+    to be as long as your hash function's output (e.g 256-bit for SHA256).
+    The ``length`` parameter controls the length of the generated one time
+    password and must be >= 6 and <= 8.
 
     This is an implementation of :rfc:`6238`.
 
@@ -123,8 +124,8 @@ This can be accomplished with something similar to the following code.
         >>> totp.verify(b"94287082", 59)
 
     :param bytes key: Secret key as ``bytes``. This value must be generated in a
-                      cryptographically secure fashion and be at least 128 bits.
-                      It is recommended that the key be 160 bits.
+                      cryptographically secure fashion and be as long as your hash
+                      function's output (e.g 256-bit for SHA256).
     :param int length: Length of generated one time password as ``int``.
     :param algorithm: A
         :class:`~cryptography.hazmat.primitives.hashes`
@@ -137,5 +138,3 @@ This can be accomplished with something similar to the following code.
                         or if the ``length`` parameter is not between 6 to 8.
     :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
                                   ``SHA1()``, ``SHA256()`` or ``SHA512()``.
-
-
-- 
cgit v1.2.3


From 341399d1ed7237568d3a2a7016e671700be9d627 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Sat, 22 Feb 2014 14:50:24 +0800
Subject: Fixed documentation based on alexs' comments.

---
 docs/hazmat/primitives/twofactor.rst           | 27 +++++++++++++-------------
 tests/hazmat/primitives/twofactor/test_totp.py |  8 ++++++++
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 120beb06..18bf4c01 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -30,13 +30,13 @@ codes (HMAC).
         >>> from cryptography.hazmat.backends import default_backend
         >>> from cryptography.hazmat.primitives.twofactor.hotp import HOTP
         >>> from cryptography.hazmat.primitives.hashes import SHA1
-        >>> key = b"12345678901234567890"
+        >>> key = os.urandom(16)
         >>> hotp = HOTP(key, 6, SHA1(), backend=default_backend())
-        >>> hotp.generate(0)
+        >>> hotp.generate(0) # doctest: +SKIP
         '755224'
-        >>> hotp.verify(b"755224", 0)
+        >>> hotp.verify(b"755224", 0) # doctest: +SKIP
 
-    :param bytes key: Secret key as ``bytes``. This value must be generated in a
+    :param bytes key: Secret key. This value must be generated in a
                       cryptographically secure fashion and be at least 128 bits.
                       It is recommended that the key be 160 bits.
     :param int length: Length of generated one time password as ``int``.
@@ -46,8 +46,8 @@ codes (HMAC).
     :param backend: A
         :class:`~cryptography.hazmat.backends.interfaces.HMACBackend`
         provider.
-    :raises ValueError: This is raised if the provided ``key`` is shorter 128 bits
-                        or if the ``length`` parameter is not between 6 to 8.
+    :raises ValueError: This is raised if the provided ``key`` is shorter than 128 bits
+                        or if the ``length`` parameter is not 6, 7 or 8.
     :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
                                   ``SHA1()``, ``SHA256()`` or ``SHA512()``.
 
@@ -114,27 +114,28 @@ This can be accomplished with something similar to the following code.
     .. doctest::
 
         >>> import os
+        >>> import time
         >>> from cryptography.hazmat.backends import default_backend
         >>> from cryptography.hazmat.primitives.twofactor.totp import TOTP
         >>> from cryptography.hazmat.primitives.hashes import SHA1
-        >>> key = b"12345678901234567890"
+        >>> key = os.urandom(16)
         >>> totp = TOTP(key, 8, SHA1(), 30, backend=default_backend())
-        >>> totp.generate(59)
+        >>> totp.generate(time.time()) # doctest: +SKIP
         '94287082'
-        >>> totp.verify(b"94287082", 59)
+        >>> totp.verify(b"94287082", 59) # doctest: +SKIP
 
-    :param bytes key: Secret key as ``bytes``. This value must be generated in a
+    :param bytes key: Secret key. This value must be generated in a
                       cryptographically secure fashion and be as long as your hash
                       function's output (e.g 256-bit for SHA256).
     :param int length: Length of generated one time password as ``int``.
     :param algorithm: A
         :class:`~cryptography.hazmat.primitives.hashes`
         provider.
-    :param int time_step: The time step size. The default should be 30.
+    :param int time_step: The time step size. The recommended size is 30.
     :param backend: A
         :class:`~cryptography.hazmat.backends.interfaces.HMACBackend`
         provider.
-    :raises ValueError: This is raised if the provided ``key`` is shorter 128 bits
-                        or if the ``length`` parameter is not between 6 to 8.
+    :raises ValueError: This is raised if the provided ``key`` is shorter than 128 bits
+                        or if the ``length`` parameter is not 6, 7 or 8.
     :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
                                   ``SHA1()``, ``SHA256()`` or ``SHA512()``.
diff --git a/tests/hazmat/primitives/twofactor/test_totp.py b/tests/hazmat/primitives/twofactor/test_totp.py
index ea18a40c..58819be4 100644
--- a/tests/hazmat/primitives/twofactor/test_totp.py
+++ b/tests/hazmat/primitives/twofactor/test_totp.py
@@ -57,3 +57,11 @@ class TestTOTP(object):
 
             with pytest.raises(InvalidToken):
                 totp.verify(b"12345678", time)
+
+    def test_floating_point_time_generate(self, backend):
+        secret = b"12345678901234567890"
+        time = 59.1
+
+        totp = TOTP(secret, 8, SHA1(), 30, backend)
+
+        assert totp.generate(time) == b"94287082"
-- 
cgit v1.2.3


From cec584caa9b857da35b8e8a8f0b1f7295ddf661f Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Sat, 22 Feb 2014 19:11:35 +0800
Subject: Updated secret key description

---
 docs/hazmat/primitives/twofactor.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 18bf4c01..3951a1cc 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -36,9 +36,9 @@ codes (HMAC).
         '755224'
         >>> hotp.verify(b"755224", 0) # doctest: +SKIP
 
-    :param bytes key: Secret key. This value must be generated in a
-                      cryptographically secure fashion and be at least 128 bits.
-                      It is recommended that the key be 160 bits.
+    :param bytes key: Per-user secret key. This value must be kept secret
+                      and be at least 128 bits. It is recommended that the
+                      key be 160 bits.
     :param int length: Length of generated one time password as ``int``.
     :param algorithm: A
         :class:`~cryptography.hazmat.primitives.hashes`
@@ -124,9 +124,9 @@ This can be accomplished with something similar to the following code.
         '94287082'
         >>> totp.verify(b"94287082", 59) # doctest: +SKIP
 
-    :param bytes key: Secret key. This value must be generated in a
-                      cryptographically secure fashion and be as long as your hash
-                      function's output (e.g 256-bit for SHA256).
+    :param bytes key: Per-user secret key. This value must be kept secret
+                      and be at least 128 bits. It is recommended that the
+                      key be 160 bits.
     :param int length: Length of generated one time password as ``int``.
     :param algorithm: A
         :class:`~cryptography.hazmat.primitives.hashes`
-- 
cgit v1.2.3


From 52e1e930880456e69b9a0fdd371337225fc3511b Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Sun, 23 Feb 2014 00:23:55 +0800
Subject: Added method definitions to TOTP documentation.

---
 docs/hazmat/primitives/twofactor.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 3951a1cc..2e170b85 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -59,7 +59,7 @@ codes (HMAC).
     .. method:: verify(hotp, counter)
 
         :param bytes hotp: The one time password value to validate.
-        :param bytes counter: The counter value to validate against.
+        :param int counter: The counter value to validate against.
         :raises cryptography.exceptions.InvalidToken: This is raised when the supplied HOTP
                                                       does not match the expected HOTP.
 
@@ -139,3 +139,15 @@ This can be accomplished with something similar to the following code.
                         or if the ``length`` parameter is not 6, 7 or 8.
     :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
                                   ``SHA1()``, ``SHA256()`` or ``SHA512()``.
+
+    .. method:: generate(time)
+
+        :param int counter: The time value used to generate the one time password.
+        :return bytes: A one time password value.
+
+    .. method:: verify(totp, time)
+
+        :param bytes hotp: The one time password value to validate.
+        :param int time: The time value to validate against.
+        :raises cryptography.exceptions.InvalidToken: This is raised when the supplied TOTP
+                                                      does not match the expected TOTP.
-- 
cgit v1.2.3


From 3b6423dc2a10320d739554e88c1384a8e8a068c2 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Sun, 23 Feb 2014 12:40:13 +0800
Subject: Updated HOTP and TOTP doctests

---
 docs/hazmat/primitives/twofactor.rst | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 2e170b85..ca18c50b 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -32,9 +32,8 @@ codes (HMAC).
         >>> from cryptography.hazmat.primitives.hashes import SHA1
         >>> key = os.urandom(16)
         >>> hotp = HOTP(key, 6, SHA1(), backend=default_backend())
-        >>> hotp.generate(0) # doctest: +SKIP
-        '755224'
-        >>> hotp.verify(b"755224", 0) # doctest: +SKIP
+        >>> hotp_value = hotp.generate(0)
+        >>> hotp.verify(hotp_value, 0)
 
     :param bytes key: Per-user secret key. This value must be kept secret
                       and be at least 128 bits. It is recommended that the
@@ -120,9 +119,9 @@ This can be accomplished with something similar to the following code.
         >>> from cryptography.hazmat.primitives.hashes import SHA1
         >>> key = os.urandom(16)
         >>> totp = TOTP(key, 8, SHA1(), 30, backend=default_backend())
-        >>> totp.generate(time.time()) # doctest: +SKIP
-        '94287082'
-        >>> totp.verify(b"94287082", 59) # doctest: +SKIP
+        >>> time_value = time.time()
+        >>> totp_value = totp.generate(time_value)
+        >>> totp.verify(totp_value, time_value)
 
     :param bytes key: Per-user secret key. This value must be kept secret
                       and be at least 128 bits. It is recommended that the
-- 
cgit v1.2.3


From 0a46667a19d70a013e2c50ac6af6c3b17516ce49 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Mon, 24 Feb 2014 00:08:27 +0800
Subject: Added __future__ import statement

---
 cryptography/hazmat/primitives/twofactor/totp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cryptography/hazmat/primitives/twofactor/totp.py b/cryptography/hazmat/primitives/twofactor/totp.py
index 79752f3b..1327a252 100644
--- a/cryptography/hazmat/primitives/twofactor/totp.py
+++ b/cryptography/hazmat/primitives/twofactor/totp.py
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import absolute_import, division, print_function
+
 from cryptography.exceptions import InvalidToken
 from cryptography.hazmat.primitives import constant_time
 from cryptography.hazmat.primitives.twofactor.hotp import HOTP
-- 
cgit v1.2.3


From 1f8a1e801196280c4f7708a65e582f7e599b78c0 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Mon, 24 Feb 2014 16:24:12 +0800
Subject: Fixed documentation

---
 cryptography/hazmat/primitives/twofactor/totp.py |  2 +-
 docs/hazmat/primitives/twofactor.rst             | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cryptography/hazmat/primitives/twofactor/totp.py b/cryptography/hazmat/primitives/twofactor/totp.py
index 1327a252..be84b477 100644
--- a/cryptography/hazmat/primitives/twofactor/totp.py
+++ b/cryptography/hazmat/primitives/twofactor/totp.py
@@ -25,7 +25,7 @@ class TOTP(object):
         self._hotp = HOTP(key, length, algorithm, backend)
 
     def generate(self, time):
-        counter = int(time/self._time_step)
+        counter = int(time / self._time_step)
         return self._hotp.generate(counter)
 
     def verify(self, totp, time):
diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index ca18c50b..4160a17a 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -39,7 +39,7 @@ codes (HMAC).
                       and be at least 128 bits. It is recommended that the
                       key be 160 bits.
     :param int length: Length of generated one time password as ``int``.
-    :param algorithm: A
+    :param HashAlgorithm algorithm: A
         :class:`~cryptography.hazmat.primitives.hashes`
         provider.
     :param backend: A
@@ -48,7 +48,9 @@ codes (HMAC).
     :raises ValueError: This is raised if the provided ``key`` is shorter than 128 bits
                         or if the ``length`` parameter is not 6, 7 or 8.
     :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
-                                  ``SHA1()``, ``SHA256()`` or ``SHA512()``.
+                                  :class:`~cryptography.hazmat.primitives.hashes.SHA1()`,
+                                  :class:`~cryptography.hazmat.primitives.hashes.SHA256()`
+                                  or :class:`~cryptography.hazmat.primitives.hashes.SHA512()`.
 
     .. method:: generate(counter)
 
@@ -127,7 +129,7 @@ This can be accomplished with something similar to the following code.
                       and be at least 128 bits. It is recommended that the
                       key be 160 bits.
     :param int length: Length of generated one time password as ``int``.
-    :param algorithm: A
+    :param HashAlgorithm algorithm: A
         :class:`~cryptography.hazmat.primitives.hashes`
         provider.
     :param int time_step: The time step size. The recommended size is 30.
@@ -137,7 +139,9 @@ This can be accomplished with something similar to the following code.
     :raises ValueError: This is raised if the provided ``key`` is shorter than 128 bits
                         or if the ``length`` parameter is not 6, 7 or 8.
     :raises UnsupportedAlgorithm: This is raised if the provided ``algorithm`` is not
-                                  ``SHA1()``, ``SHA256()`` or ``SHA512()``.
+                                  :class:`~cryptography.hazmat.primitives.hashes.SHA1()`,
+                                  :class:`~cryptography.hazmat.primitives.hashes.SHA256()`
+                                  or :class:`~cryptography.hazmat.primitives.hashes.SHA512()`.
 
     .. method:: generate(time)
 
@@ -146,7 +150,7 @@ This can be accomplished with something similar to the following code.
 
     .. method:: verify(totp, time)
 
-        :param bytes hotp: The one time password value to validate.
+        :param bytes totp: The one time password value to validate.
         :param int time: The time value to validate against.
         :raises cryptography.exceptions.InvalidToken: This is raised when the supplied TOTP
                                                       does not match the expected TOTP.
-- 
cgit v1.2.3


From 93da520fb9874faf5226aa45f6c087c21955c109 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Tue, 25 Feb 2014 10:39:29 +0800
Subject: Fixed whitespace issue pointed out by flake8

---
 cryptography/hazmat/primitives/twofactor/hotp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptography/hazmat/primitives/twofactor/hotp.py b/cryptography/hazmat/primitives/twofactor/hotp.py
index a6b01b5b..e806c7ef 100644
--- a/cryptography/hazmat/primitives/twofactor/hotp.py
+++ b/cryptography/hazmat/primitives/twofactor/hotp.py
@@ -54,7 +54,7 @@ class HOTP(object):
         ctx.update(struct.pack(">Q", counter))
         hmac_value = ctx.finalize()
 
-        offset_bits = six.indexbytes(hmac_value, len(hmac_value)-1) & 0b1111
+        offset_bits = six.indexbytes(hmac_value, len(hmac_value) - 1) & 0b1111
 
         offset = int(offset_bits)
         p = hmac_value[offset:offset + 4]
-- 
cgit v1.2.3


From 72e7477089995e848c9b6f809104babb9379b16f Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Tue, 25 Feb 2014 11:43:48 +0800
Subject: Fixed wrong param naming in totp documentation

---
 docs/hazmat/primitives/twofactor.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 4160a17a..06be151e 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -145,7 +145,7 @@ This can be accomplished with something similar to the following code.
 
     .. method:: generate(time)
 
-        :param int counter: The time value used to generate the one time password.
+        :param int time: The time value used to generate the one time password.
         :return bytes: A one time password value.
 
     .. method:: verify(totp, time)
-- 
cgit v1.2.3


From c18dc45eb241d58ec0e81d04ec3f961ad7562ad0 Mon Sep 17 00:00:00 2001
From: Ayrx <terrycwk1994@gmail.com>
Date: Tue, 25 Feb 2014 12:06:18 +0800
Subject: Seperated the totp tests based on different hash types

---
 tests/hazmat/primitives/twofactor/test_totp.py | 97 +++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 17 deletions(-)

diff --git a/tests/hazmat/primitives/twofactor/test_totp.py b/tests/hazmat/primitives/twofactor/test_totp.py
index 58819be4..8877a70a 100644
--- a/tests/hazmat/primitives/twofactor/test_totp.py
+++ b/tests/hazmat/primitives/twofactor/test_totp.py
@@ -15,7 +15,6 @@ import pytest
 
 from cryptography.exceptions import InvalidToken
 from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.hashes import SHA1
 from cryptography.hazmat.primitives.twofactor.totp import TOTP
 from tests.utils import load_vectors_from_file, load_nist_vectors
 
@@ -26,42 +25,106 @@ vectors = load_vectors_from_file(
 @pytest.mark.hmac
 class TestTOTP(object):
 
-    @pytest.mark.parametrize("params", vectors)
-    def test_generate(self, backend, params):
+    @pytest.mark.supported(
+        only_if=lambda backend: backend.hmac_supported(hashes.SHA1()),
+        skip_message="Does not support HMAC-SHA1."
+    )
+    @pytest.mark.parametrize(
+        "params", [i for i in vectors if i["mode"] == b"SHA1"])
+    def test_generate_sha1(self, backend, params):
         secret = params["secret"]
         time = int(params["time"])
-        mode = params["mode"]
         totp_value = params["totp"]
 
-        algorithm = getattr(hashes, mode.decode())
-        totp = TOTP(secret, 8, algorithm(), 30, backend)
+        totp = TOTP(secret, 8, hashes.SHA1(), 30, backend)
         assert totp.generate(time) == totp_value
 
-    @pytest.mark.parametrize("params", vectors)
-    def test_verify(self, backend, params):
+    @pytest.mark.supported(
+        only_if=lambda backend: backend.hmac_supported(hashes.SHA256()),
+        skip_message="Does not support HMAC-SHA256."
+    )
+    @pytest.mark.parametrize(
+        "params", [i for i in vectors if i["mode"] == b"SHA256"])
+    def test_generate_sha256(self, backend, params):
         secret = params["secret"]
         time = int(params["time"])
-        mode = params["mode"]
         totp_value = params["totp"]
 
-        algorithm = getattr(hashes, mode.decode())
-        totp = TOTP(secret, 8, algorithm(), 30, backend)
+        totp = TOTP(secret, 8, hashes.SHA256(), 30, backend)
+        assert totp.generate(time) == totp_value
+
+    @pytest.mark.supported(
+        only_if=lambda backend: backend.hmac_supported(hashes.SHA512()),
+        skip_message="Does not support HMAC-SHA512."
+    )
+    @pytest.mark.parametrize(
+        "params", [i for i in vectors if i["mode"] == b"SHA512"])
+    def test_generate_sha512(self, backend, params):
+        secret = params["secret"]
+        time = int(params["time"])
+        totp_value = params["totp"]
+
+        totp = TOTP(secret, 8, hashes.SHA512(), 30, backend)
+        assert totp.generate(time) == totp_value
+
+    @pytest.mark.supported(
+        only_if=lambda backend: backend.hmac_supported(hashes.SHA1()),
+        skip_message="Does not support HMAC-SHA1."
+    )
+    @pytest.mark.parametrize(
+        "params", [i for i in vectors if i["mode"] == b"SHA1"])
+    def test_verify_sha1(self, backend, params):
+        secret = params["secret"]
+        time = int(params["time"])
+        totp_value = params["totp"]
+
+        totp = TOTP(secret, 8, hashes.SHA1(), 30, backend)
+
+        assert totp.verify(totp_value, time) is None
+
+    @pytest.mark.supported(
+        only_if=lambda backend: backend.hmac_supported(hashes.SHA256()),
+        skip_message="Does not support HMAC-SHA256."
+    )
+    @pytest.mark.parametrize(
+        "params", [i for i in vectors if i["mode"] == b"SHA256"])
+    def test_verify_sha256(self, backend, params):
+        secret = params["secret"]
+        time = int(params["time"])
+        totp_value = params["totp"]
+
+        totp = TOTP(secret, 8, hashes.SHA256(), 30, backend)
+
+        assert totp.verify(totp_value, time) is None
+
+    @pytest.mark.supported(
+        only_if=lambda backend: backend.hmac_supported(hashes.SHA512()),
+        skip_message="Does not support HMAC-SHA512."
+    )
+    @pytest.mark.parametrize(
+        "params", [i for i in vectors if i["mode"] == b"SHA512"])
+    def test_verify_sha512(self, backend, params):
+        secret = params["secret"]
+        time = int(params["time"])
+        totp_value = params["totp"]
+
+        totp = TOTP(secret, 8, hashes.SHA512(), 30, backend)
 
         assert totp.verify(totp_value, time) is None
 
     def test_invalid_verify(self, backend):
-            secret = b"12345678901234567890"
-            time = 59
+        secret = b"12345678901234567890"
+        time = 59
 
-            totp = TOTP(secret, 8, SHA1(), 30, backend)
+        totp = TOTP(secret, 8, hashes.SHA1(), 30, backend)
 
-            with pytest.raises(InvalidToken):
-                totp.verify(b"12345678", time)
+        with pytest.raises(InvalidToken):
+            totp.verify(b"12345678", time)
 
     def test_floating_point_time_generate(self, backend):
         secret = b"12345678901234567890"
         time = 59.1
 
-        totp = TOTP(secret, 8, SHA1(), 30, backend)
+        totp = TOTP(secret, 8, hashes.SHA1(), 30, backend)
 
         assert totp.generate(time) == b"94287082"
-- 
cgit v1.2.3