rpms/qca-tls/devel qca-tls-1.0-ossl098.patch, NONE, 1.1 qca-tls.spec, 1.11, 1.12
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Sun Nov 13 21:11:20 UTC 2005
Author: abompard
Update of /cvs/extras/rpms/qca-tls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30033
Modified Files:
qca-tls.spec
Added Files:
qca-tls-1.0-ossl098.patch
Log Message:
missing file...
qca-tls-1.0-ossl098.patch:
--- NEW FILE qca-tls-1.0-ossl098.patch ---
--- ./qca-tls.cpp.openssl 2005-11-13 21:58:48.000000000 +0100
+++ ./qca-tls.cpp 2005-11-13 21:59:54.000000000 +0100
@@ -454,7 +454,11 @@
if(!r) {
// try this other public function, for whatever reason
p = (void *)in;
+#ifdef OSSL_097
+ r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len);
+#else
r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len);
+#endif
}
if(r) {
if(pub) {
@@ -798,7 +802,11 @@
bool createFromDER(const char *in, unsigned int len)
{
+#ifdef OSSL_097
+ unsigned char *p = (const unsigned char *)in;
+#else
unsigned char *p = (unsigned char *)in;
+#endif
X509 *t = d2i_X509(NULL, &p, len);
if(!t)
return false;
Index: qca-tls.spec
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qca-tls.spec 13 Nov 2005 21:07:15 -0000 1.11
+++ qca-tls.spec 13 Nov 2005 21:11:18 -0000 1.12
@@ -1,6 +1,6 @@
Name: qca-tls
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: TLS plugin for the Qt Cryptographic Architecture
License: LGPL
@@ -10,7 +10,7 @@
# Fix build in mach for QT apps
Patch0: qca-tls-1.0-mach.patch
# Missing ifdefs for openssl 0.9.8
-Patch1: qca-tls-1.0-openssl.patch
+Patch1: qca-tls-1.0-ossl098.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel >= 1:3.1.1
@@ -56,6 +56,9 @@
%changelog
+* Sun Nov 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- build for openssl 0.9.8
+
* Sun Nov 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
- fix BRs
More information about the scm-commits
mailing list