summaryrefslogtreecommitdiff
path: root/dropbearkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'dropbearkey.c')
-rw-r--r--dropbearkey.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/dropbearkey.c b/dropbearkey.c
index 05e6d33..a0d315b 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -67,36 +67,36 @@ static void printhelp(char * progname) {
fprintf(stderr, "Usage: %s -t <type> -f <filename> [-s bits]\n"
"-t type Type of key to generate. One of:\n"
-#ifdef DROPBEAR_RSA
+#if DROPBEAR_RSA
" rsa\n"
#endif
-#ifdef DROPBEAR_DSS
+#if DROPBEAR_DSS
" dss\n"
#endif
-#ifdef DROPBEAR_ECDSA
+#if DROPBEAR_ECDSA
" ecdsa\n"
#endif
"-f filename Use filename for the secret key.\n"
" ~/.ssh/id_dropbear is recommended for client keys.\n"
"-s bits Key size in bits, should be a multiple of 8 (optional)\n"
-#ifdef DROPBEAR_DSS
+#if DROPBEAR_DSS
" DSS has a fixed size of 1024 bits\n"
#endif
-#ifdef DROPBEAR_ECDSA
+#if DROPBEAR_ECDSA
" ECDSA has sizes "
-#ifdef DROPBEAR_ECC_256
+#if DROPBEAR_ECC_256
"256 "
#endif
-#ifdef DROPBEAR_ECC_384
+#if DROPBEAR_ECC_384
"384 "
#endif
-#ifdef DROPBEAR_ECC_521
+#if DROPBEAR_ECC_521
"521 "
#endif
"\n"
#endif
"-y Just print the publickey and fingerprint for the\n private key in <filename>.\n"
-#ifdef DEBUG_TRACE
+#if DEBUG_TRACE
"-v verbose\n"
#endif
,progname);
@@ -106,7 +106,7 @@ static void printhelp(char * progname) {
static void check_signkey_bits(enum signkey_type type, int bits)
{
switch (type) {
-#ifdef DROPBEAR_RSA
+#if DROPBEAR_RSA
case DROPBEAR_SIGNKEY_RSA:
if (bits < 512 || bits > 4096 || (bits % 8 != 0)) {
dropbear_exit("Bits must satisfy 512 <= bits <= 4096, and be a"
@@ -126,8 +126,8 @@ static void check_signkey_bits(enum signkey_type type, int bits)
}
}
-#if defined(DBMULTI_dropbearkey) || !defined(DROPBEAR_MULTI)
-#if defined(DBMULTI_dropbearkey) && defined(DROPBEAR_MULTI)
+#if defined(DBMULTI_dropbearkey) || !DROPBEAR_MULTI
+#if defined(DBMULTI_dropbearkey) && DROPBEAR_MULTI
int dropbearkey_main(int argc, char ** argv) {
#else
int main(int argc, char ** argv) {
@@ -174,7 +174,7 @@ int main(int argc, char ** argv) {
printhelp(argv[0]);
exit(EXIT_SUCCESS);
break;
-#ifdef DEBUG_TRACE
+#if DEBUG_TRACE
case 'v':
debug_trace = 1;
break;
@@ -206,19 +206,19 @@ int main(int argc, char ** argv) {
exit(EXIT_FAILURE);
}
-#ifdef DROPBEAR_RSA
+#if DROPBEAR_RSA
if (strcmp(typetext, "rsa") == 0)
{
keytype = DROPBEAR_SIGNKEY_RSA;
}
#endif
-#ifdef DROPBEAR_DSS
+#if DROPBEAR_DSS
if (strcmp(typetext, "dss") == 0)
{
keytype = DROPBEAR_SIGNKEY_DSS;
}
#endif
-#ifdef DROPBEAR_ECDSA
+#if DROPBEAR_ECDSA
if (strcmp(typetext, "ecdsa") == 0)
{
keytype = DROPBEAR_SIGNKEY_ECDSA_KEYGEN;