diff options
| author | brnrd <brnrd@FreeBSD.org> | 2016-07-02 19:35:15 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2016-07-02 19:35:15 +0800 |
| commit | a990218f9818f326d7e6169a2061fa9ef2a26131 (patch) | |
| tree | e5304e1c27be31e54fc89ecc0d53e5753a584146 | |
| parent | 3c7096227b2310ee338eff215955b0e39d2e6b67 (diff) | |
| download | freebsd-ports-graphics-a990218f9818f326d7e6169a2061fa9ef2a26131.tar.gz freebsd-ports-graphics-a990218f9818f326d7e6169a2061fa9ef2a26131.tar.zst freebsd-ports-graphics-a990218f9818f326d7e6169a2061fa9ef2a26131.zip | |
net/gq: Replace deprecated des_ methods and structs
- Patch des_ methods and structs with DES_ equivalents
- Move from USE_OPENSSL to USES=ssl
PR: 198340
| -rw-r--r-- | net/gq/Makefile | 3 | ||||
| -rw-r--r-- | net/gq/files/patch-src_gq-hash-openssl.c | 60 |
2 files changed, 61 insertions, 2 deletions
diff --git a/net/gq/Makefile b/net/gq/Makefile index 6132d19eab9..5ff90ecebdd 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -19,9 +19,8 @@ DND_DESC= Enable Drag and drop support in browse mode CACHE_DESC= Support the OpenLDAP experimental client cache USE_GNOME= intltool libglade2 gnomedocutils -USE_OPENSSL= yes USE_OPENLDAP= yes -USES= gettext gmake pkgconfig shared-mime-info desktop-file-utils +USES= desktop-file-utils gettext pkgconfig gmake shared-mime-info ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb DND_CONFIGURE_ENABLE= browser-dns diff --git a/net/gq/files/patch-src_gq-hash-openssl.c b/net/gq/files/patch-src_gq-hash-openssl.c new file mode 100644 index 00000000000..37232758973 --- /dev/null +++ b/net/gq/files/patch-src_gq-hash-openssl.c @@ -0,0 +1,60 @@ +--- src/gq-hash-openssl.c.orig 2008-01-09 14:55:46 UTC ++++ src/gq-hash-openssl.c +@@ -60,7 +60,7 @@ gq_hash_crypt(gchar const *data, gsize l + salt->str[2] = 0; + + g_byte_array_append(gb, (guchar*)"{CRYPT}", 7); +- des_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf); ++ DES_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf); + + g_byte_array_append(gb, cryptbuf, strlen((gchar*)cryptbuf)); + +@@ -242,7 +242,7 @@ static const char *lmhash_key = "KGS!@#$ + /* FIXME: silently assumes US-ASCII (or a single-byte encoding to be + handled by toupper) */ + +-static void lm_make_key(const char *pw, des_cblock *key) ++static void lm_make_key(const char *pw, DES_cblock *key) + { + int i; + char *k = (char *) key; +@@ -253,7 +253,7 @@ static void lm_make_key(const char *pw, + k[i+1] = (pw[i] << (7 - i)) & 0xff; + } + +- des_set_odd_parity(key); ++ DES_set_odd_parity(key); + } + + GByteArray* +@@ -262,10 +262,10 @@ gq_hash_lmhash(gchar const* data, gsize + unsigned int i; + char hex[2]; + char plain[15]; +- des_key_schedule schedule; ++ DES_key_schedule schedule; + GByteArray *gb = NULL; +- des_cblock ckey1, ckey2; +- des_cblock bin1, bin2; ++ DES_cblock ckey1, ckey2; ++ DES_cblock bin1, bin2; + + memset(plain, 0, sizeof(plain)); + +@@ -274,12 +274,12 @@ gq_hash_lmhash(gchar const* data, gsize + } + + lm_make_key(plain, &ckey1); +- des_set_key_unchecked(&ckey1, schedule); +- des_ecb_encrypt((des_cblock*)lmhash_key, &bin1, schedule, DES_ENCRYPT); ++ DES_set_key_unchecked(&ckey1, &schedule); ++ DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin1, &schedule, DES_ENCRYPT); + + lm_make_key(plain + 7, &ckey2); +- des_set_key_unchecked(&ckey2, schedule); +- des_ecb_encrypt((des_cblock*)lmhash_key, &bin2, schedule, DES_ENCRYPT); ++ DES_set_key_unchecked(&ckey2, &schedule); ++ DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin2, &schedule, DES_ENCRYPT); + + gb = g_byte_array_new(); + |