openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to h323plus-1.28.0.

Browse Source
This commit is contained in:
ajacoutot
2023-07-04 22:51:46 +00:00
parent 9d97e07907
commit 171bc89a0e
7 changed files with 5 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/h323plus/Makefile
+2 -3
View File
@@ -2,13 +2,12 @@ COMMENT= H.323 video conferencing library
GH_ACCOUNT= willamowius
GH_PROJECT= h323plus
GH_TAGNAME= v1_27_2
GH_TAGNAME= v1_28_0
PKGNAME= ${DISTNAME:S/_/./g}
REVISION= 3
CATEGORIES= net devel
SHARED_LIBS += h323 6.3
SHARED_LIBS += h323 6.4
HOMEPAGE= http://www.h323plus.org/
net/h323plus/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (h323plus-1_27_2.tar.gz) = fsUOTWOo7v/gdPloNaM2wIw3TNTLoXFzzNIZOv10xPk=
SIZE (h323plus-1_27_2.tar.gz) = 3514260
SHA256 (h323plus-1_28_0.tar.gz) = zeEBOes+XHJRhezsV9qdj8mPS93ex3huHKzn3kzhrAY=
SIZE (h323plus-1_28_0.tar.gz) = 3522871
net/h323plus/patches/patch-configure
+1 -1
View File
@@ -3,7 +3,7 @@ Do not override PTLIBDIR in the environment.
Index: configure
--- configure.orig
+++ configure
@@ -4141,7 +4141,9 @@ $as_echo "yes" >&6; }
@@ -4121,7 +4121,9 @@ $as_echo "yes" >&6; }
HAS_PTLIB=1
fi
if test ${HAS_PTLIB}x = 1x; then
net/h323plus/patches/patch-src_h235_h235crypto_cxx
-46
View File
@@ -1,46 +0,0 @@
Unbreak build with opaque EVP_CIPHER_CTX in LibreSSL 3.5
Index: src/h235/h235crypto.cxx
--- src/h235/h235crypto.cxx.orig
+++ src/h235/h235crypto.cxx
@@ -64,7 +64,7 @@ extern "C" {
// the IV sequence is always 6 bytes long (2 bytes seq number + 4 bytes timestamp)
const unsigned int IV_SEQUENCE_LEN = 6;
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
inline const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx)
{
@@ -326,8 +326,12 @@ int H235CryptoHelper::DecryptFinalCTS(EVP_CIPHER_CTX *
int i = 0;
unsigned char C_n_minus_2[EVP_MAX_BLOCK_LENGTH];
+#if defined(LIBRESSL_VERSION_NUMBER)
+ if (!EVP_CIPHER_CTX_get_iv(ctx, C_n_minus_2, bl))
+ return 0;
+#else
memcpy(C_n_minus_2, EVP_CIPHER_CTX_iv(ctx), bl);
-
+#endif
/* C_n plus 0s in buf */
memset(&(buf[leftover]), 0, (bl - leftover));
@@ -503,7 +507,7 @@ void H235CryptoEngine::SetKey(PBYTEArray key)
return;
}
} else {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
EVP_CIPHER_CTX_cleanup(m_encryptCtx);
EVP_CIPHER_CTX_init(m_encryptCtx);
#else
@@ -523,7 +527,7 @@ void H235CryptoEngine::SetKey(PBYTEArray key)
return;
}
} else {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
EVP_CIPHER_CTX_cleanup(m_decryptCtx);
EVP_CIPHER_CTX_init(m_decryptCtx);
#else
net/h323plus/patches/patch-src_h235_h235support_cxx
-14
View File
@@ -1,14 +0,0 @@
Unbreak build with opaque DH in LibreSSL 3.5.
Index: src/h235/h235support.cxx
--- src/h235/h235support.cxx.orig
+++ src/h235/h235support.cxx
@@ -55,7 +55,7 @@ extern "C" {
#include <openssl/bn.h>
};
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
inline void DH_get0_pqg(const DH *dh,
const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
net/h323plus/patches/patch-src_h235auth1_cxx
-14
View File
@@ -1,14 +0,0 @@
Unbreak build with opaque EVP_MD_CTX in LibreSSL 3.5.
Index: src/h235auth1.cxx
--- src/h235auth1.cxx.orig
+++ src/h235auth1.cxx
@@ -68,7 +68,7 @@ static const BYTE SearchPattern[HASH_SIZE] = { // Must
#define SHA_BLOCKSIZE 64
#endif
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
namespace {
net/h323plus/patches/patch-src_h323ep_cxx
-14
View File
@@ -1,14 +0,0 @@
Unbreak build with opaque DH in LibreSSL 3.5.
Index: src/h323ep.cxx
--- src/h323ep.cxx.orig
+++ src/h323ep.cxx
@@ -439,7 +439,7 @@ PBoolean H323_TLSContext::SetDHParameters(const PBYTEA
BIGNUM* g = BN_bin2bn(dh_g, dh_g.GetSize(), NULL);
if (p != NULL && g != NULL)
{
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
dh->p = p;
dh->g = g;
#else