diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-20 15:05:27 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-20 15:05:27 -0600 |
commit | 81a68fc96d0845f5ee812665405276a935d05a79 (patch) | |
tree | 0478a737c0db71df5bee8f1b02d2a89713590867 /docs/hazmat/backends/interfaces.rst | |
parent | 74169660e47b760f82c0653b4210b3bc5d3bf46b (diff) | |
parent | 78456c71627d9234a4668ce2fb36e12525cae6b1 (diff) | |
download | cryptography-81a68fc96d0845f5ee812665405276a935d05a79.tar.gz cryptography-81a68fc96d0845f5ee812665405276a935d05a79.tar.bz2 cryptography-81a68fc96d0845f5ee812665405276a935d05a79.zip |
Merge branch 'master' into urandom-engine
* master: (58 commits)
Moar backtick.
Add to changelog.
move some dashes around :)
experiment to disable duplicate cc test runs on osx and speed up travis
Remove register_cipher_adapter from the interface and the documentation.
expand tox backend example
On OS X at build time compile the CC bindings
remove an extraneous linefeed
reformat bindings and remove GCM for the moment
add cipher bindings for CommonCrypto
doc updates
hmac support for commoncrypto
added versionadded
changelog to note addition of commoncrypto backend with hash support
fix docs
doc updates
update docs for name attribute
fix copy mistake in docs
increase indent and note the value of the attribute in the docs
move HashMethods to top level
...
Diffstat (limited to 'docs/hazmat/backends/interfaces.rst')
-rw-r--r-- | docs/hazmat/backends/interfaces.rst | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index 5b6cd64d..11e2f2a2 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -33,25 +33,6 @@ A specific ``backend`` may provide one or more of these interfaces. :returns: ``True`` if the specified ``cipher`` and ``mode`` combination is supported by this backend, otherwise ``False`` - .. method:: register_cipher_adapter(cipher_cls, mode_cls, adapter) - - Register an adapter which can be used to create a backend specific - object from instances of the - :class:`~cryptography.hazmat.primitives.interfaces.CipherAlgorithm` and - the :class:`~cryptography.hazmat.primitives.interfaces.Mode` primitives. - - :param cipher_cls: A class whose instances provide - :class:`~cryptography.hazmat.primitives.interfaces.CipherAlgorithm` - :param mode_cls: A class whose instances provide: - :class:`~cryptography.hazmat.primitives.interfaces.Mode` - :param adapter: A ``function`` that takes 3 arguments, ``backend`` (a - :class:`CipherBackend` provider), ``cipher`` (a - :class:`~cryptography.hazmat.primitives.interfaces.CipherAlgorithm` - provider ), and ``mode`` (a - :class:`~cryptography.hazmat.primitives.interfaces.Mode` provider). - It returns a backend specific object which may be used to construct - a :class:`~cryptogrpahy.hazmat.primitives.interfaces.CipherContext`. - .. method:: create_symmetric_encryption_ctx(cipher, mode) |