aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-12-20 11:40:21 -0500
committerNick Mathewson <nickm@torproject.org>2013-12-20 11:40:21 -0500
commitb98c5884fc28c4c2b4871d00bd6eeb78fadab3f3 (patch)
tree2b014f98374bb0f692c4a041ac8d90315b885a19
parent85284c33d1952711703087eb64149ef55ea775cf (diff)
parent129f26e9591325a7866bac22e0c0a3df1877fcdb (diff)
downloadtor-b98c5884fc28c4c2b4871d00bd6eeb78fadab3f3.tar.gz
tor-b98c5884fc28c4c2b4871d00bd6eeb78fadab3f3.zip
Merge remote-tracking branch 'linus/bug10324'
-rw-r--r--changes/bug103242
-rw-r--r--src/tools/tor-gencert.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/bug10324 b/changes/bug10324
new file mode 100644
index 0000000000..9cd7d5bdb8
--- /dev/null
+++ b/changes/bug10324
@@ -0,0 +1,2 @@
+ o Tool changes:
+ - Make tor-gencert create 2048 bit signing keys. Addresses ticket #10324.
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 25beb2aae1..2f95cf7c52 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -34,7 +34,7 @@
#include "address.h"
#define IDENTITY_KEY_BITS 3072
-#define SIGNING_KEY_BITS 1024
+#define SIGNING_KEY_BITS 2048
#define DEFAULT_LIFETIME 12
/* These globals are set via command line options. */