Attachment 2604 Details for Bug 2388 – unresolved gen_candidates and prime_test symbols

[patch] unresolved gen_candidates and prime_test symbols

0002-ssh-keygen.c-add-needed-WITH_OPENSSL-gaurds.patch (text/plain), 1.27 KB, created by Reuben Hawkins on 2015-04-25 08:12:13 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Reuben Hawkins

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

Size: 1.27 KB

patch

obsolete

>From 5e54f19532f4fb10485c6464a5aa4952995d4b2f Mon Sep 17 00:00:00 2001
>From: Reuben Hawkins <reubenhwk@gmail.com>
>Date: Wed, 22 Apr 2015 20:42:35 -0700
>Subject: [PATCH 2/4] ssh-keygen.c: add needed WITH_OPENSSL gaurds
>
>ssh-keygen was failing to link on unresolved gen_candidates and prime_test
>symbols.  These functions are only available when ssh links to ssl.
>
>Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
>---
> ssh-keygen.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/ssh-keygen.c b/ssh-keygen.c
>index 0518638..dbbfdf3 100644
>--- a/ssh-keygen.c
>+++ b/ssh-keygen.c
>@@ -174,10 +174,12 @@ extern char *__progname;
> 
> char hostname[NI_MAXHOST];
> 
>+#ifdef WITH_OPENSSL
> /* moduli.c */
> int gen_candidates(FILE *, u_int32_t, u_int32_t, BIGNUM *);
> int prime_test(FILE *, FILE *, u_int32_t, u_int32_t, char *, unsigned long,
>     unsigned long);
>+#endif
> 
> static void
> type_bits_valid(int type, const char *name, u_int32_t *bitsp)
>@@ -2571,6 +2573,7 @@ main(int argc, char **argv)
> 		}
> 	}
> 
>+#ifdef WITH_OPENSSL
> 	if (do_gen_candidates) {
> 		FILE *out = fopen(out_file, "w");
> 
>@@ -2610,6 +2613,7 @@ main(int argc, char **argv)
> 			fatal("modulus screening failed");
> 		return (0);
> 	}
>+#endif /* WITH_OPENSSL */
> 
> 	if (gen_all_hostkeys) {
> 		do_gen_all_hostkeys(pw);
>-- 
>2.3.0
>

Actions: View | Diff

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