|
 |
69c1e12 |
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopenssl.cpp
|
|
|
69c1e12 |
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp 2008-10-23 01:05:00.000000000 +0200
|
|
|
69c1e12 |
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp 2009-09-04 14:09:22.000000000 +0200
|
|
|
69c1e12 |
@@ -196,6 +196,7 @@
|
|
|
69c1e12 |
static X509_NAME *(*K_X509_NAME_new)() = 0L;
|
|
|
69c1e12 |
static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
|
|
|
69c1e12 |
static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
|
|
|
69c1e12 |
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
|
|
|
69c1e12 |
static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
|
|
|
69c1e12 |
|
|
|
69c1e12 |
#endif
|
|
|
69c1e12 |
@@ -530,6 +531,7 @@
|
|
|
69c1e12 |
K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
|
|
|
69c1e12 |
K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
|
|
|
69c1e12 |
K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
|
|
|
69c1e12 |
+ K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
|
|
|
69c1e12 |
#endif
|
|
|
69c1e12 |
}
|
|
|
69c1e12 |
|
|
|
69c1e12 |
@@ -1577,6 +1579,13 @@
|
|
|
69c1e12 |
return 0L;
|
|
|
69c1e12 |
}
|
|
|
69c1e12 |
|
|
|
69c1e12 |
+
|
|
|
69c1e12 |
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
|
|
|
69c1e12 |
+ if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
|
|
|
69c1e12 |
+ return 0L;
|
|
|
69c1e12 |
+}
|
|
|
69c1e12 |
+
|
|
|
69c1e12 |
+
|
|
|
69c1e12 |
STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
|
|
|
69c1e12 |
if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
|
|
|
69c1e12 |
return 0L;
|
|
|
69c1e12 |
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl.h
|
|
|
69c1e12 |
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.h 2009-05-19 14:06:53.000000000 +0200
|
|
|
69c1e12 |
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h 2009-09-04 14:09:22.000000000 +0200
|
|
|
69c1e12 |
@@ -589,13 +589,17 @@
|
|
|
69c1e12 |
*/
|
|
|
69c1e12 |
void ASN1_INTEGER_free(ASN1_INTEGER *x);
|
|
|
69c1e12 |
|
|
|
69c1e12 |
-
|
|
|
69c1e12 |
/*
|
|
|
69c1e12 |
* ASN1_STRING_data
|
|
|
69c1e12 |
*/
|
|
|
69c1e12 |
unsigned char *ASN1_STRING_data(ASN1_STRING *x);
|
|
|
69c1e12 |
|
|
|
69c1e12 |
/*
|
|
|
69c1e12 |
+ * ASN1_STRING_length
|
|
|
69c1e12 |
+ */
|
|
|
69c1e12 |
+ int ASN1_STRING_length(ASN1_STRING *x);
|
|
|
69c1e12 |
+
|
|
|
69c1e12 |
+ /*
|
|
|
69c1e12 |
*
|
|
|
69c1e12 |
*/
|
|
|
69c1e12 |
int OBJ_obj2nid(ASN1_OBJECT *o);
|
|
|
69c1e12 |
diff -Nur kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp
|
|
|
69c1e12 |
--- kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp 2009-01-16 16:07:05.000000000 +0100
|
|
|
69c1e12 |
+++ kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp 2009-09-04 14:09:22.000000000 +0200
|
|
|
69c1e12 |
@@ -1305,7 +1305,9 @@
|
|
|
69c1e12 |
}
|
|
|
69c1e12 |
|
|
|
69c1e12 |
QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
|
|
|
69c1e12 |
- if (!s.isEmpty()) {
|
|
|
69c1e12 |
+ if (!s.isEmpty() &&
|
|
|
69c1e12 |
+ /* skip subjectAltNames with embedded NULs */
|
|
|
69c1e12 |
+ s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
|
|
|
69c1e12 |
rc += s;
|
|
|
69c1e12 |
}
|
|
|
69c1e12 |
}
|