From dae323ea50e150f7d4fc709a1e1162719f9d612e Mon Sep 17 00:00:00 2001 From: Jakuje Date: Tue, 14 Mar 2017 22:47:13 +0100 Subject: [PATCH] License clarification (#988) * License clarification: Olaf Kirch > Please refresh my memory; what is the license of the other files in > pkcs15init and the pkcs11 code that I authored? Any files missing > license information should use the same. https://sourceforge.net/p/opensc/mailman/message/35704660/ * License clarificaiton: Vincent Le Toux > Do whatever you want with it ;-) https://sourceforge.net/p/opensc/mailman/message/35704731/ * License clarification: Ludovic Rousseau > So the license should be the same as for pcsc-lite i.e. 3-clause BSD > license as in, the original, > https://github.com/LudovicRousseau/PCSC/blob/master/src/PCSC/winscard.h > I added a license in the strlcpycat.h file for pcsc-lite. See > https://github.com/LudovicRousseau/PCSC/blob/master/src/strlcpycat.h https://sourceforge.net/p/opensc/mailman/message/35705399/ --- src/common/compat_report_rangecheckfailure.c | 19 ++++++++++++- src/common/compat_strlcpy.h | 25 ++++++++++++++-- src/common/libpkcs11.c | 14 +++++++++ src/libopensc/internal-winscard.h | 30 ++++++++++++++++++++ src/libopensc/reader-openct.c | 14 +++++++++ src/pkcs11/mechanism.c | 14 +++++++++ src/pkcs11/openssl.c | 14 +++++++++ src/pkcs15init/pkcs15-init.h | 14 +++++++++ src/pkcs15init/profile.h | 14 +++++++++ 9 files changed, 154 insertions(+), 4 deletions(-) diff --git a/src/common/compat_report_rangecheckfailure.c b/src/common/compat_report_rangecheckfailure.c index 50b3aa60..f90e87a8 100644 --- a/src/common/compat_report_rangecheckfailure.c +++ b/src/common/compat_report_rangecheckfailure.c @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2015 Vincent Le Toux + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -18,4 +35,4 @@ __declspec(noreturn) void __cdecl __report_rangecheckfailure() #endif #endif -#endif \ No newline at end of file +#endif diff --git a/src/common/compat_strlcpy.h b/src/common/compat_strlcpy.h index bd701eab..a293142a 100644 --- a/src/common/compat_strlcpy.h +++ b/src/common/compat_strlcpy.h @@ -1,10 +1,29 @@ /* - * MUSCLE SmartCard Development ( http://www.linuxnet.com ) + * MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html ) * - * Copyright (C) 2004 + * Copyright (C) 2004-2010 * Ludovic Rousseau * - * $Id: strlcpycat.h 1421 2005-04-12 12:09:21Z rousseau $ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** diff --git a/src/common/libpkcs11.c b/src/common/libpkcs11.c index 1823eefc..4ded9389 100644 --- a/src/common/libpkcs11.c +++ b/src/common/libpkcs11.c @@ -3,6 +3,20 @@ * and will bind to a specific pkcs11 module. * * Copyright (C) 2002 Olaf Kirch + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #if HAVE_CONFIG_H diff --git a/src/libopensc/internal-winscard.h b/src/libopensc/internal-winscard.h index c55856cd..82a64392 100644 --- a/src/libopensc/internal-winscard.h +++ b/src/libopensc/internal-winscard.h @@ -1,3 +1,33 @@ +/* + * MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html ) + * + * Copyright (C) 1999-2003 + * David Corcoran + * Copyright (C) 2002-2009 + * Ludovic Rousseau + * +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + #ifndef __INTERNAL_WINSCARD_H #define __INTERNAL_WINSCARD_H diff --git a/src/libopensc/reader-openct.c b/src/libopensc/reader-openct.c index 45d76b0a..d66d391b 100644 --- a/src/libopensc/reader-openct.c +++ b/src/libopensc/reader-openct.c @@ -2,6 +2,20 @@ * reader-openct.c: backend for OpenCT * * Copyright (C) 2003 Olaf Kirch + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #if HAVE_CONFIG_H diff --git a/src/pkcs11/mechanism.c b/src/pkcs11/mechanism.c index 6ceaba77..f6e7b1cd 100644 --- a/src/pkcs11/mechanism.c +++ b/src/pkcs11/mechanism.c @@ -2,6 +2,20 @@ * Generic handling of PKCS11 mechanisms * * Copyright (C) 2002 Olaf Kirch + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "config.h" diff --git a/src/pkcs11/openssl.c b/src/pkcs11/openssl.c index a6254327..a1a412e5 100644 --- a/src/pkcs11/openssl.c +++ b/src/pkcs11/openssl.c @@ -3,6 +3,20 @@ * et al * * Copyright (C) 2002 Olaf Kirch + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "config.h" diff --git a/src/pkcs15init/pkcs15-init.h b/src/pkcs15init/pkcs15-init.h index 4e7f85aa..03e4d9af 100644 --- a/src/pkcs15init/pkcs15-init.h +++ b/src/pkcs15init/pkcs15-init.h @@ -2,6 +2,20 @@ * Function prototypes for pkcs15-init * * Copyright (C) 2002 Olaf Kirch + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PKCS15_INIT_H diff --git a/src/pkcs15init/profile.h b/src/pkcs15init/profile.h index d957de67..f9f10776 100644 --- a/src/pkcs15init/profile.h +++ b/src/pkcs15init/profile.h @@ -2,6 +2,20 @@ * Card profile information (internal) * * Copyright (C) 2002 Olaf Kirch + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _OPENSC_PROFILE_H