Attachment 2605 Details for Bug 2388 – isolate and wrap WITH_OPENSSH options

[patch] isolate and wrap WITH_OPENSSH options

0003-ssh-keygen.c-isolate-ssl-code-wrap-in-WITH_OPENSSL.patch (text/plain), 3.47 KB, created by Reuben Hawkins on 2015-04-25 08:13:31 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Reuben Hawkins

Created: 2015-04-25 08:13:31 AEST

Size: 3.47 KB

patch

obsolete

>From 85fbaee16d926dd169c9f527b91b634e0878b68e Mon Sep 17 00:00:00 2001
>From: Reuben Hawkins <reubenhwk@gmail.com>
>Date: Wed, 22 Apr 2015 20:42:42 -0700
>Subject: [PATCH 3/4] ssh-keygen.c: isolate ssl code, wrap in WITH_OPENSSL
>
>There are a number of ssh-keygen options which only apply in a with-openssl
>build.  These options were already partially guarded in WITH_OPENSSL macros.
>This change isolates and wraps the rest of those options producing a clean,
>warning free build with openssl disabled.
>
>Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
>---
> ssh-keygen.c | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
>diff --git a/ssh-keygen.c b/ssh-keygen.c
>index dbbfdf3..c993736 100644
>--- a/ssh-keygen.c
>+++ b/ssh-keygen.c
>@@ -2223,9 +2223,11 @@ usage(void)
> 	    "       ssh-keygen -H [-f known_hosts_file]\n"
> 	    "       ssh-keygen -R hostname [-f known_hosts_file]\n"
> 	    "       ssh-keygen -r hostname [-f input_keyfile] [-g]\n"
>+#ifdef WITH_OPENSSL
> 	    "       ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n"
> 	    "       ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n"
> 	    "                  [-j start_line] [-K checkpt] [-W generator]\n"
>+#endif
> 	    "       ssh-keygen -s ca_key -I certificate_identity [-h] [-n principals]\n"
> 	    "                  [-O option] [-V validity_interval] [-z serial_number] file ...\n"
> 	    "       ssh-keygen -L [-f input_keyfile]\n"
>@@ -2243,17 +2245,21 @@ int
> main(int argc, char **argv)
> {
> 	char dotsshdir[PATH_MAX], comment[1024], *passphrase1, *passphrase2;
>-	char *checkpoint = NULL;
>-	char out_file[PATH_MAX], *rr_hostname = NULL, *ep, *fp, *ra;
>+	char *rr_hostname = NULL, *ep, *fp, *ra;
> 	struct sshkey *private, *public;
> 	struct passwd *pw;
> 	struct stat st;
> 	int r, opt, type, fd;
>-	u_int32_t memory = 0, generator_wanted = 0;
>+#ifdef WITH_OPENSSL
>+	char out_file[PATH_MAX];
>+	u_int32_t generator_wanted = 0;
>+	char *checkpoint = NULL;
>+	u_int32_t memory = 0;
> 	int do_gen_candidates = 0, do_screen_candidates = 0;
>-	int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0;
>-	unsigned long start_lineno = 0, lines_to_process = 0;
> 	BIGNUM *start = NULL;
>+	unsigned long start_lineno = 0, lines_to_process = 0;
>+#endif
>+	int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0;
> 	FILE *f;
> 	const char *errstr;
> 
>@@ -2312,12 +2318,6 @@ main(int argc, char **argv)
> 		case 'I':
> 			cert_key_id = optarg;
> 			break;
>-		case 'J':
>-			lines_to_process = strtoul(optarg, NULL, 10);
>-                        break;
>-		case 'j':
>-			start_lineno = strtoul(optarg, NULL, 10);
>-                        break;
> 		case 'R':
> 			delete_host = 1;
> 			rr_hostname = optarg;
>@@ -2432,6 +2432,13 @@ main(int argc, char **argv)
> 		case 'r':
> 			rr_hostname = optarg;
> 			break;
>+#ifdef WITH_OPENSSL
>+		case 'j':
>+			start_lineno = strtoul(optarg, NULL, 10);
>+                        break;
>+		case 'J':
>+			lines_to_process = strtoul(optarg, NULL, 10);
>+                        break;
> 		case 'W':
> 			generator_wanted = (u_int32_t)strtonum(optarg, 1,
> 			    UINT_MAX, &errstr);
>@@ -2445,7 +2452,6 @@ main(int argc, char **argv)
> 				fatal("Invalid number: %s (%s)",
> 					optarg, errstr);
> 			break;
>-#ifdef WITH_OPENSSL
> 		case 'M':
> 			memory = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr);
> 			if (errstr)
>@@ -2589,7 +2595,6 @@ main(int argc, char **argv)
> 
> 		return (0);
> 	}
>-
> 	if (do_screen_candidates) {
> 		FILE *in;
> 		FILE *out = fopen(out_file, "a");
>-- 
>2.3.0
>

Actions: View | Diff

Attachments on bug 2388: 2599 | 2603 | 2604 | 2605 | 2606 | 2633 | 2634