summaryrefslogtreecommitdiff
path: root/dropbearkey.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2013-05-09 23:24:58 +0800
committerMatt Johnston <matt@ucc.asn.au>2013-05-09 23:24:58 +0800
commit74489acc85000972a5ac88c0487e5e7a0302eb33 (patch)
tree233eab0cf078721b7c3e83fc04274ea2985dda39 /dropbearkey.c
parent5123549bfccccaa43871481c300ea4d627dcfbda (diff)
downloaddropbear-74489acc85000972a5ac88c0487e5e7a0302eb33.tar.gz
Fix build for dropbearkey and ecdsa with certain options
Diffstat (limited to 'dropbearkey.c')
-rw-r--r--dropbearkey.c57
1 files changed, 39 insertions, 18 deletions
diff --git a/dropbearkey.c b/dropbearkey.c
index 8bc114c..1d3dfe7 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -76,7 +76,7 @@ static void printhelp(char * progname) {
" dss\n"
#endif
#ifdef DROPBEAR_ECDSA
- " ecdsa\n"
+ " ecdsa\n"
#endif
"-f filename Use filename for the secret key\n"
"-s bits Key size in bits, should be a multiple of 8 (optional)\n"
@@ -200,23 +200,44 @@ int main(int argc, char ** argv) {
}
// TODO: put RSA and DSS size checks into genrsa.c etc
- if (keytype == DROPBEAR_SIGNKEY_DSS && bits != 1024) {
- fprintf(stderr, "DSS keys have a fixed size of 1024 bits\n");
- exit(EXIT_FAILURE);
- } else if (bits < 512 || bits > 4096 || (bits % 8 != 0)) {
- fprintf(stderr, "Bits must satisfy 512 <= bits <= 4096, and be a"
- " multiple of 8\n");
- exit(EXIT_FAILURE);
- }
- } else {
- if (keytype == DROPBEAR_SIGNKEY_DSS) {
- bits = DSS_DEFAULT_SIZE;
- } else if (keytype == DROPBEAR_SIGNKEY_RSA) {
- bits = RSA_DEFAULT_SIZE;
- } else if (keytype == DROPBEAR_SIGNKEY_ECDSA_KEYGEN) {
- bits = ECDSA_DEFAULT_SIZE;
- } else {
- exit(EXIT_FAILURE); /* not reached */
+ switch (keytype) {
+#ifdef DROPBEAR_RSA
+ case DROPBEAR_SIGNKEY_RSA:
+ if (bits < 512 || bits > 4096 || (bits % 8 != 0)) {
+ fprintf(stderr, "Bits must satisfy 512 <= bits <= 4096, and be a"
+ " multiple of 8\n");
+ exit(EXIT_FAILURE);
+ }
+ break;
+#endif
+#ifdef DROPEAR_DSS
+ case DROPBEAR_SIGNKEY_DSS:
+ if (bits != 1024) {
+ fprintf(stderr, "DSS keys have a fixed size of 1024 bits\n");
+ exit(EXIT_FAILURE);
+ }
+#endif
+ // pass. ecdsa handles checks itself
+ }
+
+ switch (keytype) {
+#ifdef DROPBEAR_RSA
+ case DROPBEAR_SIGNKEY_RSA:
+ bits = RSA_DEFAULT_SIZE;
+ break;
+#endif
+#ifdef DROPBEAR_DSS
+ case DROPBEAR_SIGNKEY_DSS:
+ bits = DSS_DEFAULT_SIZE;
+ break;
+#endif
+#ifdef DROPBEAR_ECDSA
+ case DROPBEAR_SIGNKEY_ECDSA_KEYGEN:
+ bits = ECDSA_DEFAULT_SIZE;
+ break;
+#endif
+ default:
+ exit(EXIT_FAILURE); /* not reached */
}
}