CVS commit: pkgsrc/net/rdesktop

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun  8 04:45:46 UTC 2026

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

Log Message:
rdesktop: fix for nettle 4.0


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/rdesktop/distinfo
cvs rdiff -u -r1.3 -r1.4 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/distinfo
diff -u pkgsrc/net/rdesktop/distinfo:1.30 pkgsrc/net/rdesktop/distinfo:1.31
--- pkgsrc/net/rdesktop/distinfo:1.30   Tue Oct 26 11:06:48 2021
+++ pkgsrc/net/rdesktop/distinfo        Mon Jun  8 04:45:46 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 11:06:48 nia Exp $
+$NetBSD: distinfo,v 1.31 2026/06/08 04:45:46 adam Exp $
 
 BLAKE2s (rdesktop-1.9.0.tar.gz) = 9d4cca8219975403d90a9b5ddc5376694ca7760a72287692b631899645f5c724
 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-ssl.c) = 4f0aa2effc9ca70da9053bded92a8d6c86fc4895
 SHA1 (patch-xwin.c) = 1910b5e237c66961061ef5a2e7404ad22444cee8

Index: pkgsrc/net/rdesktop/patches/patch-ssl.c
diff -u pkgsrc/net/rdesktop/patches/patch-ssl.c:1.3 pkgsrc/net/rdesktop/patches/patch-ssl.c:1.4
--- pkgsrc/net/rdesktop/patches/patch-ssl.c:1.3 Tue Feb  4 09:15:51 2020
+++ pkgsrc/net/rdesktop/patches/patch-ssl.c     Mon Jun  8 04:45:46 2026
@@ -1,11 +1,31 @@
-$NetBSD: patch-ssl.c,v 1.3 2020/02/04 09:15:51 markd Exp $
+$NetBSD: patch-ssl.c,v 1.4 2026/06/08 04:45:46 adam Exp $
+
+Fix for Nettle 4.0.
 
 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
+@@ -41,7 +41,7 @@ rdssl_sha1_final(RDSSL_SHA1 * sha1, uint8 * out_data)
+ void
+ rdssl_sha1_final(RDSSL_SHA1 * sha1, uint8 * out_data)
+ {
+-      sha1_digest(sha1, SHA1_DIGEST_SIZE, out_data);
++      sha1_digest(sha1, out_data);
+ }
+ 
+ void
+@@ -59,7 +59,7 @@ rdssl_md5_final(RDSSL_MD5 * md5, uint8 * out_data)
+ void
+ rdssl_md5_final(RDSSL_MD5 * md5, uint8 * out_data)
+ {
+-      md5_digest(md5, MD5_DIGEST_SIZE, out_data);
++      md5_digest(md5, out_data);
+ }
+ 
+ void
+@@ -307,10 +307,10 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * expo
  {
        size_t outlen;
  
@@ -18,3 +38,10 @@ commit 53ba87dc174175e98332e22355ad8662c
        if (outlen > max_exp_len)
                return 1;
  
+@@ -360,5 +360,5 @@ rdssl_hmac_md5(const void *key, int key_len, const uns
+ 
+       hmac_md5_set_key(&ctx, key_len, key);
+       hmac_md5_update(&ctx, msg_len, msg);
+-      hmac_md5_digest(&ctx, MD5_DIGEST_SIZE, md);
++      hmac_md5_digest(&ctx, md);
+ }