forked from pool/libp11
This commit is contained in:
parent
3a5a955495
commit
af0c8cb299
@ -1,18 +0,0 @@
|
||||
2006-07-19 07:39 aj
|
||||
|
||||
* trunk/src/p11_slot.c: fix bug causing a core dump.
|
||||
|
||||
================================================================================
|
||||
diff -ur libp11-0.2.2/src/p11_slot.c trunk/src/p11_slot.c
|
||||
--- libp11-0.2.2/src/p11_slot.c 2006-04-18 17:17:19.000000000 +0200
|
||||
+++ trunk/src/p11_slot.c 2006-07-19 09:39:49.000000000 +0200
|
||||
@@ -139,7 +139,8 @@
|
||||
|
||||
rv = CRYPTOKI_call(ctx, C_Login(priv->session,
|
||||
so ? CKU_SO : CKU_USER,
|
||||
- (CK_UTF8CHAR *) pin, strlen(pin)));
|
||||
+ (CK_UTF8CHAR *) pin,
|
||||
+ pin ? strlen(pin) : 0));
|
||||
CRYPTOKI_checkerr(PKCS11_F_PKCS11_LOGIN, rv);
|
||||
priv->loggedIn = 1;
|
||||
return 0;
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7bbb1810dc586306b9b15ca701206c8edb88de6b736c6024986319cd215c5c35
|
||||
size 310259
|
3
libp11-0.2.3.tar.bz2
Normal file
3
libp11-0.2.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cb0bfa332e124373e843d82a152a2a3c5989cca4a3c344c47076ae4e618cc5da
|
||||
size 305743
|
22
libp11-strict-aliasing.patch
Normal file
22
libp11-strict-aliasing.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- src/p11_cert.c
|
||||
+++ src/p11_cert.c
|
||||
@@ -173,7 +173,7 @@
|
||||
cert->x509 = d2i_X509(NULL, &p, size);
|
||||
}
|
||||
cert->id_len = sizeof(id);
|
||||
- if (!pkcs11_getattr_var(token, obj, CKA_ID, id, (size_t *) & cert->id_len)) {
|
||||
+ if (!pkcs11_getattr_var(token, obj, CKA_ID, id, &cert->id_len)) {
|
||||
cert->id = (unsigned char *) malloc(cert->id_len);
|
||||
memcpy(cert->id, id, cert->id_len);
|
||||
}
|
||||
--- src/p11_key.c
|
||||
+++ src/p11_key.c
|
||||
@@ -282,7 +282,7 @@
|
||||
if (!pkcs11_getattr_s(token, obj, CKA_LABEL, label, sizeof(label)))
|
||||
key->label = BUF_strdup(label);
|
||||
key->id_len = sizeof(id);
|
||||
- if (!pkcs11_getattr_var(token, obj, CKA_ID, id, (size_t *) & key->id_len)) {
|
||||
+ if (!pkcs11_getattr_var(token, obj, CKA_ID, id, &key->id_len)) {
|
||||
key->id = (unsigned char *) malloc(key->id_len);
|
||||
memcpy(key->id, id, key->id_len);
|
||||
}
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 25 16:40:27 CEST 2007 - sbrabec@suse.cz
|
||||
|
||||
- Updated to version 0.2.3:
|
||||
* update wiki export script.
|
||||
* replaced rsa header files from rsalabs (official) with scute
|
||||
(open source).
|
||||
* allow CKR_USER_ALREADY_LOGGED_IN on C_Login.
|
||||
* mark internal functions as static.
|
||||
* add code to store public keys and generate keys.
|
||||
- Name package according to shared library packaging policy.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 30 01:45:07 CEST 2007 - ro@suse.de
|
||||
|
||||
|
101
libp11.spec
101
libp11.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package libp11 (Version 0.2.2)
|
||||
# spec file for package libp11 (Version 0.2.3)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -11,16 +11,15 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: libp11
|
||||
Version: 0.2.2
|
||||
Release: 27
|
||||
Version: 0.2.3
|
||||
Release: 1
|
||||
URL: http://www.opensc-project.org/libp11/
|
||||
Group: Productivity/Security
|
||||
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
License: LGPL v2 or later
|
||||
Summary: Library Implementing a Small Layer on Top of PKCS#11 API
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch: %{name}-%{version}-crash.patch
|
||||
Autoreqprov: on
|
||||
BuildRequires: openssl-devel pkgconfig zlib-devel
|
||||
Patch: libp11-strict-aliasing.patch
|
||||
BuildRequires: openssl-devel pkg-config zlib-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -45,10 +44,37 @@ Authors:
|
||||
Olaf Kirch
|
||||
Stef Hoeben
|
||||
|
||||
%package devel
|
||||
%package -n libp11-0
|
||||
Group: Productivity/Security
|
||||
Summary: Library Implementing a Small Layer on Top of PKCS#11 API
|
||||
Requires: %{name} = %{version} glibc-devel openssl-devel libtool
|
||||
Obsoletes: %{name} <= %{version}
|
||||
|
||||
%description -n libp11-0
|
||||
Libp11 is a library implementing a small layer on top of PKCS#11 API to
|
||||
make using PKCS#11 implementations easier.
|
||||
|
||||
The official name for PKCS#11 is "RSA Security Inc. PKCS #11
|
||||
Cryptographic Token Interface (Cryptoki)".
|
||||
|
||||
Libp11 source code includes the official header files (version 2.20)
|
||||
and thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic
|
||||
Token Interface (Cryptoki)".
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Andreas Jellinghaus
|
||||
Kevin Stefanik
|
||||
Ludovic Rousseau
|
||||
Nils Larsch
|
||||
Olaf Kirch
|
||||
Stef Hoeben
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries/C and C++
|
||||
Summary: Library Implementing a Small Layer on Top of PKCS#11 API
|
||||
Requires: libp11-0 = %{version} glibc-devel openssl-devel libtool
|
||||
|
||||
%description devel
|
||||
Libp11 is a library implementing a small layer on top of PKCS#11 API to
|
||||
@ -74,48 +100,55 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -p1
|
||||
%patch
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
./configure\
|
||||
--prefix=/usr\
|
||||
--libdir=/usr/%{_lib}
|
||||
%configure
|
||||
make %{?jobs:-j%jobs}
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
|
||||
cp -a COPYING doc/README doc/ChangeLog doc/*.css doc/*.html doc/api $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
|
||||
%makeinstall
|
||||
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/libp11-0
|
||||
cp -a COPYING NEWS doc/README doc/ChangeLog doc/*.css doc/*.html $RPM_BUILD_ROOT%{_docdir}/libp11-0
|
||||
cp -a doc/api $RPM_BUILD_ROOT%{_docdir}/%{name}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
%post -n libp11-0 -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
%postun -n libp11-0 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%files -n libp11-0
|
||||
%defattr (-, root, root)
|
||||
%doc %dir %{_defaultdocdir}/%{name}
|
||||
%doc %{_defaultdocdir}/%{name}/COPYING
|
||||
%doc %{_defaultdocdir}/%{name}/README
|
||||
%doc %{_defaultdocdir}/%{name}/ChangeLog
|
||||
%doc %{_defaultdocdir}/%{name}/*.html
|
||||
%doc %{_defaultdocdir}/%{name}/*.css
|
||||
/usr/%{_lib}/*.so.*
|
||||
%doc %dir %{_docdir}/libp11-0
|
||||
%doc %{_docdir}/libp11-0/COPYING
|
||||
%doc %{_docdir}/libp11-0/NEWS
|
||||
%doc %{_docdir}/libp11-0/README
|
||||
%doc %{_docdir}/libp11-0/ChangeLog
|
||||
%doc %{_docdir}/libp11-0/*.html
|
||||
%doc %{_docdir}/libp11-0/*.css
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%defattr (-, root, root)
|
||||
%doc %{_defaultdocdir}/%{name}/api
|
||||
/usr/%{_lib}/*.so
|
||||
/usr/%{_lib}/*.*a
|
||||
/usr/%{_lib}/pkgconfig/*.pc
|
||||
/usr/include/*.h
|
||||
%doc %dir %{_docdir}/%{name}
|
||||
%doc %{_docdir}/%{name}/api
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.*a
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
* Wed Jul 25 2007 - sbrabec@suse.cz
|
||||
- Updated to version 0.2.3:
|
||||
* update wiki export script.
|
||||
* replaced rsa header files from rsalabs (official) with scute
|
||||
(open source).
|
||||
* allow CKR_USER_ALREADY_LOGGED_IN on C_Login.
|
||||
* mark internal functions as static.
|
||||
* add code to store public keys and generate keys.
|
||||
- Name package according to shared library packaging policy.
|
||||
* Fri Mar 30 2007 - ro@suse.de
|
||||
- added zlib-devel to buildreq
|
||||
* Tue Oct 03 2006 - sbrabec@suse.cz
|
||||
|
Loading…
Reference in New Issue
Block a user