[PATCH] Unbreak compilation with --without-ssh1

İsmail Dönmez ismail at donmez.ws
Fri Feb 20 18:20:45 AEDT 2015


Oh sorry for that! Hope this works better.

diff --git a/opacket.c b/opacket.c
index 7618eae..17eb889 100644
--- a/opacket.c
+++ b/opacket.c
@@ -75,6 +75,7 @@ ssh_packet_put_raw(struct ssh *ssh, const void *buf,
u_int len)
 }

 #ifdef WITH_OPENSSL
+#ifdef WITH_SSH1
 void
 ssh_packet_put_bignum(struct ssh *ssh, BIGNUM * value)
 {
@@ -83,6 +84,7 @@ ssh_packet_put_bignum(struct ssh *ssh, BIGNUM * value)
        if ((r = sshpkt_put_bignum1(ssh, value)) != 0)
                fatal("%s: %s", __func__, ssh_err(r));
 }
+#endif

 void
 ssh_packet_put_bignum2(struct ssh *ssh, BIGNUM * value)
@@ -147,6 +149,7 @@ ssh_packet_get_int64(struct ssh *ssh)
 }

 #ifdef WITH_OPENSSL
+#ifdef WITH_SSH1
 void
 ssh_packet_get_bignum(struct ssh *ssh, BIGNUM * value)
 {
@@ -155,6 +158,7 @@ ssh_packet_get_bignum(struct ssh *ssh, BIGNUM * value)
        if ((r = sshpkt_get_bignum1(ssh, value)) != 0)
                fatal("%s: %s", __func__, ssh_err(r));
 }
+#endif

 void
 ssh_packet_get_bignum2(struct ssh *ssh, BIGNUM * value)


On Thu, Feb 19, 2015 at 11:05 PM, Darren Tucker <dtucker at zip.com.au> wrote:
> Unfortunately the patch didn't make it (the list server strips out all
> attachments that are not text/plain).  Could you please resend either inline
> or as text/plain?  If not, the other alternative is to attach it to a bug at
> https://bugzilla.mindrot.org.
>
> Thanks.
>
> On Thu, Feb 19, 2015 at 8:24 AM, İsmail Dönmez <ismail at donmez.ws> wrote:
>>
>> Hi,
>>
>> Patch attached for $SUBJECT.
>>
>> ismail
>> _______________________________________________
>> openssh-unix-dev mailing list
>> openssh-unix-dev at mindrot.org
>> https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
>
>
>
>
> --
> Darren Tucker (dtucker at zip.com.au)
> GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
>     Good judgement comes with experience. Unfortunately, the experience
> usually comes from bad judgement.


More information about the openssh-unix-dev mailing list