Skip to content

Commit

Permalink
Merge branch 'package-0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
Synss committed Jun 20, 2016
2 parents d7ba877 + 87e804a commit 4cc26bc
Show file tree
Hide file tree
Showing 25 changed files with 17,532 additions and 15,421 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ debug:
CFLAGS='-DCYTHON_TRACE=1' python setup.py build_ext --inplace

test:
nosetests -v \
--with-coverage --cover-package=mbedtls \
tests
nosetests -v --with-coverage --cover-package=mbedtls

html:
cd docs && make html
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ Example::
>>> m.digest()
b'\x9d-/rj\\\x98\x80\xb1rG\x87\x0f\xe9\xe4\xeb'

.. warning::
Warning:

The message is cleared after calculation of the digest. Only call
:meth:`mbedtls.hmac.Hmac.digest` or :meth:`mbedtls.hmac.Hmac.hexdigest` once
`mbedtls.hmac.Hmac.digest()` or `mbedtls.hmac.Hmac.hexdigest()` once
per message.


Expand Down
243 changes: 145 additions & 98 deletions mbedtls/__init__.c

Large diffs are not rendered by default.

Loading

0 comments on commit 4cc26bc

Please sign in to comment.