cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring in fix for KSSL sub-system.

Browse Source
This commit is contained in:
brad 2002-08-16 19:49:27 +00:00
parent 0d05666439
commit 84d2f90b56
12 changed files with 176 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/konqueror-embedded/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2002/07/28 15:46:52 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2002/08/16 19:49:27 brad Exp $
COMMENT='stand-alone web browser'
CATEGORIES=www x11
@ -7,7 +7,7 @@ MODULES= qt2
DATE= 20020311
DISTNAME=konqueror-embedded-snapshot-${DATE}
PKGNAME=konqueror-${DATE}
PKGNAME=konqueror-${DATE}p1
HOMEPAGE=http://www.konqueror.org/embedded.html
MASTER_SITES= http://devel-home.kde.org/~hausmann/snapshots/

30
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_kssl_kopenssl_cc Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-konq-embed_kdesrc_kssl_kopenssl_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- konq-embed/kdesrc/kssl/kopenssl.cc.orig Tue Aug 21 12:07:31 2001
+++ konq-embed/kdesrc/kssl/kopenssl.cc Wed Aug 14 13:38:14 2002
@@ -92,6 +92,7 @@ static int (*K_SSL_CTX_use_certificate)
static int (*K_SSL_get_error) (SSL*, int) = NULL;
static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL;
static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL;
+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL;
static void (*K_sk_free) (STACK*) = NULL;
static int (*K_sk_num) (STACK*) = NULL;
static char* (*K_sk_value) (STACK*, int) = NULL;
@@ -254,6 +255,7 @@ KConfig *cfg;
X509**, STACK_OF(X509)**)) _cryptoLib->symbol("PKCS12_parse");
K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) _cryptoLib->symbol("EVP_PKEY_free");
K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain");
+ K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
K_sk_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value");
@@ -742,6 +744,10 @@ char *KOpenSSLProxy::sk_value(STACK *s,
void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
+}
+
+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
+ if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose);
}

14
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_kssl_kopenssl_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-konq-embed_kdesrc_kssl_kopenssl_h,v 1.1 2002/08/16 19:49:27 brad Exp $
--- konq-embed/kdesrc/kssl/kopenssl.h.orig Fri Jul 27 05:55:02 2001
+++ konq-embed/kdesrc/kssl/kopenssl.h Wed Aug 14 13:38:14 2002
@@ -277,6 +277,10 @@ public:
*/
void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
+ /*
+ * X509_STORE_CTX_set_purpose - set the purpose of the certificate
+ */
+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
/*
* X509_verify_cert - verify the certificate

12
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_kssl_ksslcertificate_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-konq-embed_kdesrc_kssl_ksslcertificate_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- konq-embed/kdesrc/kssl/ksslcertificate.cc.orig Thu Oct 25 02:12:11 2001
+++ konq-embed/kdesrc/kssl/ksslcertificate.cc Wed Aug 14 13:43:06 2002
@@ -262,6 +262,8 @@ KSSLCertificate::KSSLValidation KSSLCert
// FIXME: do all the X509_STORE_CTX_set_flags(); here
// +-----> Note that this is for 0.9.6 or better ONLY!
+ d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER);
+
//kdDebug(7029) << "KSSL verifying.............." << endl;
certStoreCTX->error = X509_V_OK;
rc = d->kossl->X509_verify_cert(certStoreCTX);

3
x11/kde/libs2/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.39 2002/07/16 12:20:42 espie Exp $
# $OpenBSD: Makefile,v 1.40 2002/08/16 19:49:27 brad Exp $
COMMENT= "X11 toolkit, libraries"
CATEGORIES= x11 x11/kde
VERSION= 2.2.2
DISTNAME= kdelibs-${VERSION}
PKGNAME= ${DISTNAME}p1
LIB_DEPENDS= png.2::graphics/png \
jpeg.62::graphics/jpeg \

30
x11/kde/libs2/patches/patch-kssl_kopenssl_cc Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-kssl_kopenssl_cc,v 1.4 2002/08/16 19:49:27 brad Exp $
--- kssl/kopenssl.cc.orig Tue Sep 4 19:08:18 2001
+++ kssl/kopenssl.cc Wed Aug 14 20:42:04 2002
@@ -92,6 +92,7 @@ static int (*K_SSL_CTX_use_certificate)
static int (*K_SSL_get_error) (SSL*, int) = NULL;
static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL;
static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL;
+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL;
static void (*K_sk_free) (STACK*) = NULL;
static int (*K_sk_num) (STACK*) = NULL;
static char* (*K_sk_value) (STACK*, int) = NULL;
@@ -254,6 +255,7 @@ KConfig *cfg;
X509**, STACK_OF(X509)**)) _cryptoLib->symbol("PKCS12_parse");
K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) _cryptoLib->symbol("EVP_PKEY_free");
K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain");
+ K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
K_sk_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value");
@@ -742,6 +744,10 @@ char *KOpenSSLProxy::sk_value(STACK *s,
void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
+}
+
+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
+ if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose);
}

14
x11/kde/libs2/patches/patch-kssl_kopenssl_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-kssl_kopenssl_h,v 1.1 2002/08/16 19:49:27 brad Exp $
--- kssl/kopenssl.h.orig Sun Jul 29 00:55:41 2001
+++ kssl/kopenssl.h Wed Aug 14 20:42:04 2002
@@ -277,6 +277,10 @@ public:
*/
void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
+ /*
+ * X509_STORE_CTX_set_purpose - set the purpose of the certificate
+ */
+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
/*
* X509_verify_cert - verify the certificate

12
x11/kde/libs2/patches/patch-kssl_ksslcertificate_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kssl_ksslcertificate_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- kssl/ksslcertificate.cc.orig Mon Nov 5 21:37:43 2001
+++ kssl/ksslcertificate.cc Wed Aug 14 20:42:04 2002
@@ -262,6 +262,8 @@ KSSLCertificate::KSSLValidation KSSLCert
// FIXME: do all the X509_STORE_CTX_set_flags(); here
// +-----> Note that this is for 0.9.6 or better ONLY!
+ d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER);
+
//kdDebug(7029) << "KSSL verifying.............." << endl;
certStoreCTX->error = X509_V_OK;
rc = d->kossl->X509_verify_cert(certStoreCTX);

3
x11/kde/libs3/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.13 2002/07/16 12:20:42 espie Exp $
# $OpenBSD: Makefile,v 1.14 2002/08/16 19:49:27 brad Exp $
COMMENT= "X11 toolkit, libraries"
CATEGORIES= x11 x11/kde
VERSION= 3.0.2
DISTNAME= kdelibs-${VERSION}
PKGNAME= ${DISTNAME}p1
LIB_DEPENDS= png.2::graphics/png \
jpeg.62::graphics/jpeg \

30
x11/kde/libs3/patches/patch-kio_kssl_kopenssl_cc Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-kio_kssl_kopenssl_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- kio/kssl/kopenssl.cc.orig Wed Apr 10 18:00:44 2002
+++ kio/kssl/kopenssl.cc Wed Aug 14 13:05:38 2002
@@ -105,6 +105,7 @@ static int (*K_SSL_CTX_use_certificate)
static int (*K_SSL_get_error) (SSL*, int) = NULL;
static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL;
static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL;
+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL;
static void (*K_sk_free) (STACK*) = NULL;
static int (*K_sk_num) (STACK*) = NULL;
static char* (*K_sk_pop) (STACK*) = NULL;
@@ -348,6 +349,7 @@ KConfig *cfg;
K_X509_REQ_free = (void (*)(X509_REQ*)) _cryptoLib->symbol("X509_REQ_free");
K_X509_REQ_new = (X509_REQ* (*)()) _cryptoLib->symbol("X509_REQ_new");
K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain");
+ K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
K_sk_pop = (char* (*) (STACK *)) _cryptoLib->symbol("sk_pop");
@@ -930,6 +932,10 @@ char *KOpenSSLProxy::sk_value(STACK *s,
void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
+}
+
+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
+ if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose);
}

14
x11/kde/libs3/patches/patch-kio_kssl_kopenssl_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-kio_kssl_kopenssl_h,v 1.1 2002/08/16 19:49:27 brad Exp $
--- kio/kssl/kopenssl.h.orig Wed Apr 10 18:00:44 2002
+++ kio/kssl/kopenssl.h Wed Aug 14 13:05:38 2002
@@ -309,6 +309,10 @@ public:
*/
void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
+ /*
+ * X509_STORE_CTX_set_purpose - set the purpose of the certificate
+ */
+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
/*
* X509_verify_cert - verify the certificate

14
x11/kde/libs3/patches/patch-kio_kssl_ksslcertificate_cc Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-kio_kssl_ksslcertificate_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- kio/kssl/ksslcertificate.cc.orig Fri Nov 30 22:30:25 2001
+++ kio/kssl/ksslcertificate.cc Wed Aug 14 13:05:38 2002
@@ -541,9 +541,8 @@ KSSLCertificate::KSSLValidation KSSLCert
//kdDebug(7029) << "KSSL setting CRL.............." << endl;
// int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
- //
- // int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
+ d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER);
//kdDebug(7029) << "KSSL verifying.............." << endl;
certStoreCTX->error = X509_V_OK;