head 1.3; access; symbols pkgsrc-2022Q2:1.2.0.48 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.46 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.44 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.42 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.40 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.38 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.36 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.34 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.30 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.10 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.32 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.28 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.26 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.24 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.22 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.20 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.18 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.16 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.14 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.12 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.8 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.6 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.4 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.2 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.1.0.32 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.30 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.28 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.26 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.24 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.22 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.20 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.18 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.16 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.14 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.12 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.10 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.8 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.6 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.4 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.2 pkgsrc-2012Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2022.08.22.22.59.07; author tnn; state dead; branches; next 1.2; commitid t3simw4TwQxpDVQD; 1.2 date 2016.09.29.12.14.38; author joerg; state Exp; branches; next 1.1; commitid 6iNKbk1rLYOchboz; 1.1 date 2012.07.05.15.42.56; author drochner; state Exp; branches; next ; desc @@ 1.3 log @prelude: remove from pkgsrc prelude is unmaintained in pkgsrc since 2009 and is several major versions behind. This makes it useless for it's intended purpose as an intrusion detection system. Can be revived if/when there is an interested maintainer. But it's probably easier to start from scratch given how stale these packages were. @ text @$NetBSD: patch-ba,v 1.2 2016/09/29 12:14:38 joerg Exp $ make this build with gnutls-3 --- prelude-admin/prelude-admin.c.orig 2009-07-08 13:50:22.000000000 +0000 +++ prelude-admin/prelude-admin.c @@@@ -57,7 +57,6 @@@@ #include #include #include -#include #include "common.h" #include "config-engine.h" @@@@ -841,29 +840,70 @@@@ static int anon_check_passwd(prelude_io_ } +static inline gnutls_transport_ptr_t fd_to_ptr(int fd) +{ + union { + gnutls_transport_ptr_t ptr; + int fd; + } data; + + data.fd = fd; + + return data.ptr; +} + + +static inline int ptr_to_fd(gnutls_transport_ptr_t ptr) +{ + union { + gnutls_transport_ptr_t ptr; + int fd; + } data; + + data.ptr = ptr; + return data.fd; +} + + +static ssize_t tls_pull(gnutls_transport_ptr_t fd, void *buf, size_t count) +{ + return read(ptr_to_fd(fd), buf, count); +} + + +static ssize_t tls_push(gnutls_transport_ptr_t fd, const void *buf, size_t count) +{ + return write(ptr_to_fd(fd), buf, count); +} + static gnutls_session new_tls_session(int sock, char *passwd) { int ret; gnutls_session session; gnutls_anon_client_credentials anoncred; + const char *err; - const int kx_priority[] = { - GNUTLS_KX_ANON_DH, -#ifdef GNUTLS_SRP_ENABLED - GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS, GNUTLS_KX_SRP_RSA, +#if defined LIBGNUTLS_VERSION_MAJOR && LIBGNUTLS_VERSION_MAJOR >= 3 +# define TLS_DH_STR "+ANON-ECDH:+ANON-DH" +#else +# define TLS_DH_STR "+ANON-DH" #endif - 0 - }; - union { - int fd; - void *ptr; - } data; +#ifdef GNUTLS_SRP_ENABLED + const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR; +#else + const char *pstring = "NORMAL:" TLS_DH_STR; +#endif gnutls_init(&session, GNUTLS_CLIENT); gnutls_set_default_priority(session); - gnutls_kx_set_priority(session, kx_priority); + + ret = gnutls_priority_set_direct(session, pstring, &err); + if (ret < 0) { + fprintf(stderr, "TLS priority syntax error at: %s\n", err); + return NULL; + } #ifdef GNUTLS_SRP_ENABLED { @@@@ -877,8 +917,9 @@@@ static gnutls_session new_tls_session(in gnutls_anon_allocate_client_credentials(&anoncred); gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred); - data.fd = sock; - gnutls_transport_set_ptr(session, data.ptr); + gnutls_transport_set_ptr(session, fd_to_ptr(sock)); + gnutls_transport_set_pull_function(session, tls_pull); + gnutls_transport_set_push_function(session, tls_push); ret = gnutls_handshake(session); if ( ret < 0 ) { @@@@ -897,8 +938,6 @@@@ static gnutls_session new_tls_session(in return session; } - - static prelude_io_t *connect_manager(const char *addr, unsigned int port, char *passwd) { int ret, sock; @ 1.2 log @Fix build against newer gnutls. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.1 2012/07/05 15:42:56 drochner Exp $ @ 1.1 log @make this build with gnutls-3, bump PKGREV @ text @d1 1 a1 1 $NetBSD$ d15 103 @