From: Tinderbox User Date: Wed, 1 Nov 2017 01:09:07 +0000 (+0000) Subject: regen master X-Git-Tag: v9.12.0b2~22 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9b3fc207df053f6d90901260119cb6884796ea0b;p=thirdparty%2Fbind9.git regen master --- diff --git a/bin/dnssec/dnssec-keygen.8 b/bin/dnssec/dnssec-keygen.8 index 2b6a6eae0dd..610f331eb3f 100644 --- a/bin/dnssec/dnssec-keygen.8 +++ b/bin/dnssec/dnssec-keygen.8 @@ -62,11 +62,11 @@ may be preferable to direct use of .RS 4 Selects the cryptographic algorithm\&. For DNSSEC keys, the value of \fBalgorithm\fR -must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256, ECDSAP384SHA384, ED25519 or ED448\&. For TKEY and SIG(0) keys, the value must be DH (Diffie Hellman); specifying this value will automatically set the +must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256, ECDSAP384SHA384, ED25519 or ED448\&. For TKEY, the value must be DH (Diffie Hellman); specifying his value will automatically set the \fB\-T KEY\fR option as well\&. .sp -TSIG keys can also by generated by setting the value to one of HMAC\-MD5, HMAC\-SHA1, HMAC\-SHA224, HMAC\-SHA256, HMAC\-SHA384, or HMAC\-SHA512\&. As with DH, specifying these values will automatically set +TSIG keys can also be generated by setting the value to one of HMAC\-MD5, HMAC\-SHA1, HMAC\-SHA224, HMAC\-SHA256, HMAC\-SHA384, or HMAC\-SHA512\&. As with DH, specifying these values will automatically set \fB\-T KEY\fR\&. Note, however, that \fBtsig\-keygen\fR produces TSIG keys in a more useful format\&. These algorithms have been deprecated in diff --git a/bin/dnssec/dnssec-keygen.html b/bin/dnssec/dnssec-keygen.html index 61e2c692c40..3b8074a82f2 100644 --- a/bin/dnssec/dnssec-keygen.html +++ b/bin/dnssec/dnssec-keygen.html @@ -103,12 +103,12 @@ of algorithm must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256, ECDSAP384SHA384, ED25519 or ED448. For - TKEY and SIG(0) keys, the value must be DH (Diffie Hellman); - specifying this value will automatically set the - -T KEY option as well. + TKEY, the value must be DH (Diffie Hellman); specifying + his value will automatically set the -T KEY + option as well.

- TSIG keys can also by generated by setting the value to + TSIG keys can also be generated by setting the value to one of HMAC-MD5, HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384, or HMAC-SHA512. As with DH, specifying these values will automatically set -T KEY. Note, diff --git a/doc/arm/man.dnssec-keygen.html b/doc/arm/man.dnssec-keygen.html index 6ed08b91773..f55b7f3ac49 100644 --- a/doc/arm/man.dnssec-keygen.html +++ b/doc/arm/man.dnssec-keygen.html @@ -121,12 +121,12 @@ of algorithm must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256, ECDSAP384SHA384, ED25519 or ED448. For - TKEY and SIG(0) keys, the value must be DH (Diffie Hellman); - specifying this value will automatically set the - -T KEY option as well. + TKEY, the value must be DH (Diffie Hellman); specifying + his value will automatically set the -T KEY + option as well.

- TSIG keys can also by generated by setting the value to + TSIG keys can also be generated by setting the value to one of HMAC-MD5, HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384, or HMAC-SHA512. As with DH, specifying these values will automatically set -T KEY. Note,