net-im/{libpurple,pidgin;finch}: Update to 2.14.14

See https://keep.imfreedom.org/pidgin/pidgin/file/eb22b625ecad/ChangeLog
for a list of changes in this release.
This commit is contained in:
Joe Marcus Clarke 2025-02-22 09:28:49 -05:00
parent da1daad73d
commit 34e06a8149
3 changed files with 5 additions and 59 deletions

View file

@ -1,6 +1,6 @@
PORTNAME?= libpurple
PORTVERSION= 2.14.13
PORTREVISION?= 1
PORTVERSION= 2.14.14
PORTREVISION?= 0
CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1716140467
SHA256 (pidgin-2.14.13.tar.bz2) = 120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8
SIZE (pidgin-2.14.13.tar.bz2) = 8230755
TIMESTAMP = 1739631562
SHA256 (pidgin-2.14.14.tar.bz2) = 0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356
SIZE (pidgin-2.14.14.tar.bz2) = 8121174

View file

@ -1,54 +0,0 @@
--- libpurple/plugins/ssl/ssl-nss.c
+++ libpurple/plugins/ssl/ssl-nss.c
@@ -282,39 +282,32 @@ x509_import_from_nss(CERTCertificate* ce
static GList *
ssl_nss_get_peer_certificates(PRFileDesc *socket, PurpleSslConnection * gsc)
{
+ CERTCertList *peerChain;
+ CERTCertListNode *cursor;
CERTCertificate *curcert;
- CERTCertificate *issuerCert;
PurpleCertificate * newcrt;
/* List of Certificate instances to return */
GList * peer_certs = NULL;
- int count;
- int64 now = PR_Now();
- curcert = SSL_PeerCertificate(socket);
- if (curcert == NULL) {
- purple_debug_error("nss", "could not DupCertificate\n");
+ peerChain = SSL_PeerCertificateChain(socket);
+ if (peerChain == NULL) {
+ purple_debug_error("nss", "no peer certificates\n");
return NULL;
}
- for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
+ for (cursor = CERT_LIST_HEAD(peerChain); !CERT_LIST_END(cursor, peerChain); cursor = CERT_LIST_NEXT(cursor)) {
+ curcert = cursor->cert;
+ if (!curcert) {
+ purple_debug_error("nss", "cursor->cert == NULL\n");
+ break;
+ }
purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
curcert->issuerName ? curcert->issuerName : "(null)");
newcrt = x509_import_from_nss(curcert);
peer_certs = g_list_append(peer_certs, newcrt);
-
- if (curcert->isRoot) {
- break;
- }
- issuerCert = CERT_FindCertIssuer(curcert, now, certUsageSSLServer);
- if (!issuerCert) {
- purple_debug_error("nss", "partial certificate chain\n");
- break;
- }
- CERT_DestroyCertificate(curcert);
- curcert = issuerCert;
}
- CERT_DestroyCertificate(curcert);
+ CERT_DestroyCertList(peerChain);
return peer_certs;
}