|
 |
473877 |
diff -up ntp-4.2.6p5/html/keygen.html.identlen ntp-4.2.6p5/html/keygen.html
|
|
|
473877 |
--- ntp-4.2.6p5/html/keygen.html.identlen 2012-12-05 11:43:46.666828864 +0100
|
|
|
473877 |
+++ ntp-4.2.6p5/html/keygen.html 2012-12-05 12:00:45.331085982 +0100
|
|
|
473877 |
@@ -43,7 +43,7 @@
|
|
|
473877 |
|
|
|
473877 |
Synopsis
|
|
|
473877 |
|
|
|
473877 |
-<tt>ntp-keygen [ -deGHIMPT ] [ -c [RSA-MD2 | RSA-MD5 | RSA-SHA
|
|
|
473877 |
+<tt>ntp-keygen [ -deGHIMPT ] [ -b modulus ] [ -c [RSA-MD2 | RSA-MD5 | RSA-SHA
|
|
|
473877 |
| RSA-SHA1 | RSA-MDC2 | RSA-RIPEMD160 | DSA-SHA | DSA-SHA1 ] ] [
|
|
|
473877 |
-i group ]
|
|
|
473877 |
[ -m modulus ] [ -p passwd2 ] [ -q passwd1 ] [ -S
|
|
|
473877 |
@@ -140,6 +140,8 @@
|
|
|
473877 |
Command Line Options
|
|
|
473877 |
|
|
|
473877 |
|
|
|
473877 |
+<tt>-b modulus</tt>
|
|
|
473877 |
+Set the modulus for generating identity keys to modulus bits. The modulus defaults to 256, but can be set from 256 (32 octets) to 2048 (256 octets). Use the larger moduli with caution, as this can consume considerable computing resources and increases the size of authenticated packets.
|
|
|
473877 |
|
|
|
473877 |
<tt>-c [ RSA-MD2 | RSA-MD5 | RSA-SHA | RSA-SHA1 | RSA-MDC2 | RSA-RIPEMD160 | DSA-SHA | DSA-SHA1 ]</tt>
|
|
|
473877 |
Select certificate and message digest/signature encryption scheme. Note that
|
|
|
473877 |
diff -up ntp-4.2.6p5/util/ntp-keygen-opts.def.identlen ntp-4.2.6p5/util/ntp-keygen-opts.def
|
|
|
473877 |
--- ntp-4.2.6p5/util/ntp-keygen-opts.def.identlen 2009-12-09 08:36:35.000000000 +0100
|
|
|
473877 |
+++ ntp-4.2.6p5/util/ntp-keygen-opts.def 2012-12-05 12:03:17.991124514 +0100
|
|
|
473877 |
@@ -16,6 +16,19 @@ include = '#include <stdlib.h>';
|
|
|
473877 |
#include version.def
|
|
|
473877 |
|
|
|
473877 |
flag = {
|
|
|
473877 |
+ value = b;
|
|
|
473877 |
+ name = imbits;
|
|
|
473877 |
+ arg-type = number;
|
|
|
473877 |
+ arg-name = imbits;
|
|
|
473877 |
+ arg-range = '256->2048';
|
|
|
473877 |
+ ifdef = OPENSSL;
|
|
|
473877 |
+ descrip = "identity modulus bits";
|
|
|
473877 |
+ doc = <<- _EndOfDoc_
|
|
|
473877 |
+ The number of bits in the identity modulus. The default is 256.
|
|
|
473877 |
+ _EndOfDoc_;
|
|
|
473877 |
+};
|
|
|
473877 |
+
|
|
|
473877 |
+flag = {
|
|
|
473877 |
value = c;
|
|
|
473877 |
name = certificate;
|
|
|
473877 |
arg-type = string;
|
|
|
473877 |
diff -up ntp-4.2.6p5/util/ntp-keygen.c.identlen ntp-4.2.6p5/util/ntp-keygen.c
|
|
|
473877 |
--- ntp-4.2.6p5/util/ntp-keygen.c.identlen 2011-12-25 00:27:16.000000000 +0100
|
|
|
473877 |
+++ ntp-4.2.6p5/util/ntp-keygen.c 2012-12-05 12:03:43.318130907 +0100
|
|
|
473877 |
@@ -318,6 +318,10 @@ main(
|
|
|
473877 |
mvpar++;
|
|
|
473877 |
nkeys = OPT_VALUE_MV_KEYS;
|
|
|
473877 |
}
|
|
|
473877 |
+
|
|
|
473877 |
+ if (HAVE_OPT( IMBITS ))
|
|
|
473877 |
+ modulus2 = OPT_VALUE_IMBITS;
|
|
|
473877 |
+
|
|
|
473877 |
if (HAVE_OPT( MODULUS ))
|
|
|
473877 |
modulus = OPT_VALUE_MODULUS;
|
|
|
473877 |
|