Skip to content

Commit 33d6614

Browse files
author
Valerie Peng
committedApr 25, 2023
8304845: Update PCSC-Lite for Suse Linux to 1.9.9 and fix incomplete license wording
Reviewed-by: manc, mullan
1 parent c92883a commit 33d6614

File tree

3 files changed

+54
-87
lines changed

3 files changed

+54
-87
lines changed
 

‎src/java.smartcardio/unix/legal/pcsclite.md

+50-17
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,57 @@
1-
## PC/SC Lite v1.9.5
1+
## PC/SC Lite v1.9.9
22

3-
### PC/SC Lite License
4-
<pre>
5-
6-
The main parts of the code are using the BSD-like licence bellow:
3+
### PC/SC Lite Notice
4+
```
5+
MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
76
8-
Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com>
9-
Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr>
10-
All rights reserved.
7+
Only 3 header files are included in this distribution: winscard.h, wintypes.h, pcsclite.h
118
12-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
9+
Copyright for winscard.h:
10+
* Copyright (C) 1999-2003
11+
* David Corcoran <corcoran@musclecard.com>
12+
* Copyright (C) 2002-2009
13+
* Ludovic Rousseau <ludovic.rousseau@free.fr>
1314
14-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
15-
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.
16-
3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
15+
Copyright for wintypes.h:
16+
* Copyright (C) 1999
17+
* David Corcoran <corcoran@musclecard.com>
18+
* Copyright (C) 2002-2011
19+
* Ludovic Rousseau <ludovic.rousseau@free.fr>
1720
18-
Changes to this license can be made only by the copyright author with explicit written consent.
21+
Copyright for pcsclite.h:
22+
* Copyright (C) 1999-2004
23+
* David Corcoran <corcoran@musclecard.com>
24+
* Copyright (C) 2002-2011
25+
* Ludovic Rousseau <ludovic.rousseau@free.fr>
26+
* Copyright (C) 2005
27+
* Martin Paljak <martin@paljak.pri.ee>
1928
20-
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.
29+
```
2130

22-
Some source code files are using other licences. See the [COPYING](https://salsa.debian.org/rousseau/PCSC/-/blob/master/COPYING) file for details.
23-
24-
</pre>
31+
### PC/SC Lite License
32+
```
33+
34+
Redistribution and use in source and binary forms, with or without
35+
modification, are permitted provided that the following conditions
36+
are met:
37+
38+
1. Redistributions of source code must retain the above copyright
39+
notice, this list of conditions and the following disclaimer.
40+
2. Redistributions in binary form must reproduce the above copyright
41+
notice, this list of conditions and the following disclaimer in the
42+
documentation and/or other materials provided with the distribution.
43+
3. The name of the author may not be used to endorse or promote products
44+
derived from this software without specific prior written permission.
45+
46+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
47+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
48+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
49+
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
50+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
51+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
52+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
53+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
54+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
55+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56+
57+
```

‎src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING

+1-67
Original file line numberDiff line numberDiff line change
@@ -26,70 +26,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2626
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

2828

29-
Some files are under GNU GPL v3 or any later version
30-
- doc/example/pcsc_demo.c
31-
- the files in src/spy/
32-
- the files in UnitaryTests/
33-
34-
Copyright (C) 2003-2014 Ludovic Rousseau
35-
36-
This program is free software: you can redistribute it and/or modify
37-
it under the terms of the GNU General Public License as published by
38-
the Free Software Foundation, either version 3 of the License, or
39-
(at your option) any later version.
40-
41-
This program is distributed in the hope that it will be useful,
42-
but WITHOUT ANY WARRANTY; without even the implied warranty of
43-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44-
GNU General Public License for more details.
45-
46-
You should have received a copy of the GNU General Public License
47-
along with this program. If not, see <http://www.gnu.org/licenses/>.
48-
49-
50-
Files src/auth.c and src/auth.h are:
51-
* Copyright (C) 2013 Red Hat
52-
*
53-
* All rights reserved.
54-
* Redistribution and use in source and binary forms, with or without
55-
* modification, are permitted provided that the following conditions
56-
* are met:
57-
*
58-
* 1. Redistributions of source code must retain the above copyright
59-
* notice, this list of conditions and the following disclaimer.
60-
*
61-
* 2. Redistributions in binary form must reproduce the above copyright
62-
* notice, this list of conditions and the following disclaimer in the
63-
* documentation and/or other materials provided with the distribution.
64-
*
65-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
66-
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
67-
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
68-
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
69-
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
70-
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
71-
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
72-
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
73-
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
74-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
75-
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
76-
* DAMAGE.
77-
*
78-
* Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
79-
80-
81-
Files src/simclist.c and src/simclist.h are:
82-
* Copyright (c) 2007,2008,2009,2010,2011 Mij <mij@bitchx.it>
83-
*
84-
* Permission to use, copy, modify, and distribute this software for any
85-
* purpose with or without fee is hereby granted, provided that the above
86-
* copyright notice and this permission notice appear in all copies.
87-
*
88-
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
89-
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
90-
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
91-
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
92-
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
93-
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
94-
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
95-
29+
Some source code files are using other licenses. However, they are not included here and thus this file is a truncated version of the [COPYING](https://salsa.debian.org/rousseau/PCSC/-/blob/master/COPYING) file.

‎src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ typedef SCARDHANDLE *LPSCARDHANDLE;
5858

5959
#define MAX_ATR_SIZE 33 /**< Maximum ATR size */
6060

61-
/* Set structure elements aligment on bytes
61+
/* Set structure elements alignment on bytes
6262
* http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html */
6363
#ifdef __APPLE__
6464
#pragma pack(1)
@@ -279,7 +279,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci, g_rgSCardRawPci;
279279
#define INFINITE 0xFFFFFFFF /**< Infinite timeout */
280280
#endif
281281

282-
#define PCSCLITE_VERSION_NUMBER "1.9.5" /**< Current version */
282+
#define PCSCLITE_VERSION_NUMBER "1.9.9" /**< Current version */
283283
/** Maximum readers context (a slot is count as a reader) */
284284
#define PCSCLITE_MAX_READERS_CONTEXTS 16
285285

@@ -292,7 +292,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci, g_rgSCardRawPci;
292292
/*
293293
* The message and buffer sizes must be multiples of 16.
294294
* The max message size must be at least large enough
295-
* to accomodate the transmit_struct
295+
* to accommodate the transmit_struct
296296
*/
297297
#define MAX_BUFFER_SIZE 264 /**< Maximum Tx/Rx Buffer for short APDU */
298298
#define MAX_BUFFER_SIZE_EXTENDED (4 + 3 + (1<<16) + 3 + 2) /**< enhanced (64K + APDU + Lc + Le + SW) Tx/Rx Buffer */

0 commit comments

Comments
 (0)
Please sign in to comment.