svn commit: r380720 - head/deskutils/growl-for-linux/files

Nicola Vitale nivit at FreeBSD.org
Sat Mar 7 22:43:53 UTC 2015


Author: nivit
Date: Sat Mar  7 22:43:51 2015
New Revision: 380720
URL: https://svnweb.freebsd.org/changeset/ports/380720
QAT: https://qat.redports.org/buildarchive/r380720/

Log:
  - Replace the deprecated methods and types of OpenSSL with the current ones
    (des_ to DES_ and adapt to method signature). The patch was accepted by the
    upstream project see https://github.com/mattn/growl-for-linux/pull/51
  
  PR:	198243
  Submitted by:	Bernard Spil <spil.oss at gmail.com>

Added:
  head/deskutils/growl-for-linux/files/patch-gol.c   (contents, props changed)

Added: head/deskutils/growl-for-linux/files/patch-gol.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/growl-for-linux/files/patch-gol.c	Sat Mar  7 22:43:51 2015	(r380720)
@@ -0,0 +1,25 @@
+--- gol.c.orig	2014-05-20 03:11:04.000000000 +0200
++++ gol.c	2015-02-28 20:05:59.171972929 +0100
+@@ -1427,18 +1427,18 @@
+             r-(ptr-top)-6, &aeskey, (unsigned char*) iv, AES_DECRYPT);
+       }
+       else if (!strcmp(crypt_algorythm, "DES")) {
+-        des_key_schedule schedule;
++        DES_key_schedule schedule;
+         DES_set_key_unchecked((const_DES_cblock*) &digest, &schedule);
+         DES_ncbc_encrypt((unsigned char*) ptr, (unsigned char*) data,
+             r-(ptr-top)-6, &schedule, (const_DES_cblock*) &iv, DES_DECRYPT);
+       }
+       else if (!strcmp(crypt_algorythm, "3DES")) {
+-        des_key_schedule schedule1, schedule2, schedule3;
++        DES_key_schedule schedule1, schedule2, schedule3;
+         DES_set_key_unchecked((const_DES_cblock*) (digest+ 0), &schedule1);
+         DES_set_key_unchecked((const_DES_cblock*) (digest+ 8), &schedule2);
+         DES_set_key_unchecked((const_DES_cblock*) (digest+16), &schedule3);
+-        des_ede3_cbc_encrypt((unsigned char*) ptr, (unsigned char*) data,
+-            r-(ptr-top)-6, schedule1, schedule2, schedule3,
++        DES_ede3_cbc_encrypt((unsigned char*) ptr, (unsigned char*) data,
++            r-(ptr-top)-6, &schedule1, &schedule2, &schedule3,
+             (const_DES_cblock*) &iv, DES_DECRYPT);
+       } else {
+         data = strdup(ptr);


More information about the svn-ports-head mailing list