diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2020-03-19 12:54:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:54:34 -0500 |
| commit | e320adfe3e44394b59bab4f3b60a52d593a9bad0 (patch) | |
| tree | 2c716ae4d63454937dcdccb49ed8d5b391b88135 | |
| parent | 382253ea0e1dd5b6c700a50cedb57ec24dd5907b (diff) | |
| download | cryptography-e320adfe3e44394b59bab4f3b60a52d593a9bad0.tar.gz cryptography-e320adfe3e44394b59bab4f3b60a52d593a9bad0.tar.bz2 cryptography-e320adfe3e44394b59bab4f3b60a52d593a9bad0.zip | |
Fix several CI breakages (#5138)
* Replace dead link
* Explicitly run for all PRs
* Update azure-pipelines.yml
* Update wheel-builder.yml
| -rw-r--r-- | .azure-pipelines/wheel-builder.yml | 3 | ||||
| -rw-r--r-- | azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | docs/hazmat/primitives/key-derivation-functions.rst | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/.azure-pipelines/wheel-builder.yml b/.azure-pipelines/wheel-builder.yml index 3f7e4d1a..47668263 100644 --- a/.azure-pipelines/wheel-builder.yml +++ b/.azure-pipelines/wheel-builder.yml @@ -1,3 +1,6 @@ +variables: + agent.preferPowerShellOnContainers: true + trigger: none pr: none diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f74de2ed..749bc712 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,6 @@ +variables: + agent.preferPowerShellOnContainers: true + trigger: branches: include: @@ -6,6 +9,8 @@ trigger: tags: include: - "*" +pr: + - "*" jobs: - job: 'mac' diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst index 40a0c3db..b5466240 100644 --- a/docs/hazmat/primitives/key-derivation-functions.rst +++ b/docs/hazmat/primitives/key-derivation-functions.rst @@ -79,8 +79,8 @@ Different KDFs are suitable for different tasks such as: :param int iterations: The number of iterations to perform of the hash function. This can be used to control the length of time the operation takes. Higher numbers help mitigate brute force attacks against derived - keys. See OWASP's `Password Storage Cheat Sheet`_ for more - detailed recommendations if you intend to use this for password storage. + keys. A `more detailed description`_ can be consulted for additional + information. :param backend: An instance of :class:`~cryptography.hazmat.backends.interfaces.PBKDF2HMACBackend`. @@ -904,7 +904,7 @@ Interface .. _`NIST SP 800-56Ar2`: https://csrc.nist.gov/publications/detail/sp/800-56a/rev-2/final .. _`ANSI X9.63:2001`: https://webstore.ansi.org .. _`SEC 1 v2.0`: https://www.secg.org/sec1-v2.pdf -.. _`Password Storage Cheat Sheet`: https://www.owasp.org/index.php/Password_Storage_Cheat_Sheet +.. _`more detailed description`: https://security.stackexchange.com/a/3993/43116 .. _`PBKDF2`: https://en.wikipedia.org/wiki/PBKDF2 .. _`key stretching`: https://en.wikipedia.org/wiki/Key_stretching .. _`HKDF`: https://en.wikipedia.org/wiki/HKDF |