CVS commit: pkgsrc/net/rdesktop

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Feb  4 09:15:51 UTC 2020

Modified Files:
        pkgsrc/net/rdesktop: Makefile distinfo
Added Files:
        pkgsrc/net/rdesktop/patches: patch-ssl.c

Log Message:
rdesktop: use correct modulus and exponent in rdssl_rkey_get_exp_mod


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/net/rdesktop/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/rdesktop/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/net/rdesktop/patches/patch-ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rdesktop/Makefile
diff -u pkgsrc/net/rdesktop/Makefile:1.52 pkgsrc/net/rdesktop/Makefile:1.53
--- pkgsrc/net/rdesktop/Makefile:1.52   Sun Jan 26 17:31:54 2020
+++ pkgsrc/net/rdesktop/Makefile        Tue Feb  4 09:15:51 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2020/01/26 17:31:54 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2020/02/04 09:15:51 markd Exp $
 
 DISTNAME=              rdesktop-1.9.0
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=rdesktop/}
 GITHUB_RELEASE=                v${PKGVERSION_NOREV}

Index: pkgsrc/net/rdesktop/distinfo
diff -u pkgsrc/net/rdesktop/distinfo:1.27 pkgsrc/net/rdesktop/distinfo:1.28
--- pkgsrc/net/rdesktop/distinfo:1.27   Wed Jan 15 15:31:28 2020
+++ pkgsrc/net/rdesktop/distinfo        Tue Feb  4 09:15:51 2020
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.27 2020/01/15 15:31:28 wiz Exp $
+$NetBSD: distinfo,v 1.28 2020/02/04 09:15:51 markd Exp $
 
 SHA1 (rdesktop-1.9.0.tar.gz) = cbd6a4dab1f0638fe30354c0d081133562d2ca62
 RMD160 (rdesktop-1.9.0.tar.gz) = a403d660585dc4f8433ea885359e4452148a2c98
 SHA512 (rdesktop-1.9.0.tar.gz) = e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 Size (rdesktop-1.9.0.tar.gz) = 368980 bytes
 SHA1 (patch-Makefile.in) = 46cec50c90b5e7aff2ae0f3f02df7b7a5b709f0a
+SHA1 (patch-ssl.c) = 07bb3e559432317af822dfb8ca06d6e0ac23ea27
 SHA1 (patch-xwin.c) = 1910b5e237c66961061ef5a2e7404ad22444cee8

Added files:

Index: pkgsrc/net/rdesktop/patches/patch-ssl.c
diff -u /dev/null pkgsrc/net/rdesktop/patches/patch-ssl.c:1.3
--- /dev/null   Tue Feb  4 09:15:51 2020
+++ pkgsrc/net/rdesktop/patches/patch-ssl.c     Tue Feb  4 09:15:51 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-ssl.c,v 1.3 2020/02/04 09:15:51 markd Exp $
+
+use correct modulus and exponent in rdssl_rkey_get_exp_mod
+commit 53ba87dc174175e98332e22355ad8662c02880d6
+
+--- ssl.c.orig 2019-09-19 10:34:03.000000000 +0000
++++ ssl.c
+@@ -307,10 +307,10 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey
+ {
+       size_t outlen;
+ 
+-      outlen = (mpz_sizeinbase(modulus, 2) + 7) / 8;
++      outlen = (mpz_sizeinbase(rkey->n, 2) + 7) / 8;
+       if (outlen > max_mod_len)
+               return 1;
+-      outlen = (mpz_sizeinbase(exponent, 2) + 7) / 8;
++      outlen = (mpz_sizeinbase(rkey->e, 2) + 7) / 8;
+       if (outlen > max_exp_len)
+               return 1;
+