You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/12/20 22:49:24 UTC
nifi git commit: NIFI-3234: Updated two broken links in the
Encryption Configuration sectionof the Admin Guide
Repository: nifi
Updated Branches:
refs/heads/master 445c07596 -> 00149603c
NIFI-3234: Updated two broken links in the Encryption Configuration sectionof the Admin Guide
This closes #1345
Signed-off-by: jpercivall <JP...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/00149603
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/00149603
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/00149603
Branch: refs/heads/master
Commit: 00149603c81593b502f8527f9b1d4c247499f60a
Parents: 445c075
Author: Sarah Olson <so...@yahoo.com>
Authored: Tue Dec 20 09:33:37 2016 -0800
Committer: jpercivall <JP...@apache.org>
Committed: Tue Dec 20 17:41:08 2016 -0500
----------------------------------------------------------------------
nifi-docs/src/main/asciidoc/administration-guide.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/00149603/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 2835576..2c643c1 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -867,8 +867,8 @@ Additional Resources
* http://security.stackexchange.com/a/6415/16485[Bcrypt vs PBKDF2]
* http://wildlyinaccurate.com/bcrypt-choosing-a-work-factor/[Choosing a work factor for Bcrypt]
* https://docs.spring.io/spring-security/site/docs/current/apidocs/org/springframework/security/crypto/bcrypt/BCrypt.html[Spring Security Bcrypt]
-* https://www.openssl.org/docs/manmaster/crypto/EVP_BytesToKey.html[OpenSSL EVP BytesToKey PKCS#1v1.5]
-* https://www.openssl.org/docs/manmaster/crypto/PKCS5_PBKDF2_HMAC.html[OpenSSL PBKDF2 KDF]
+* https://www.openssl.org/docs/man1.1.0/crypto/EVP_BytesToKey.html[OpenSSL EVP BytesToKey PKCS#1v1.5]
+* https://wiki.openssl.org/index.php/Manual:PKCS5_PBKDF2_HMAC(3)[OpenSSL PBKDF2 KDF]
* http://security.stackexchange.com/a/29139/16485[OpenSSL KDF flaws description]
Salt and IV Encoding