james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

correct license on ykcs11 files

Browse Source
This commit is contained in:
Klas Lindfors
2016-08-11 15:46:23 +02:00
parent 89d8a60876
commit 0d7854540e
3 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/version.c
+23 -22
View File
@@ -2,28 +2,29 @@
* Copyright (c) 2015 Yubico AB * Copyright (c) 2015 Yubico AB
* All rights reserved. * All rights reserved.
* *
* This program is free software: you can redistribute it and/or modify * Redistribution and use in source and binary forms, with or without
* it under the terms of the GNU General Public License as published by * modification, are permitted provided that the following conditions are
* the Free Software Foundation, either version 3 of the License, or * met:
* (at your option) any later version. *
* * * Redistributions of source code must retain the above copyright
* This program is distributed in the hope that it will be useful, * notice, this list of conditions and the following disclaimer.
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * Redistributions in binary form must reproduce the above
* GNU General Public License for more details. * copyright notice, this list of conditions and the following
* * disclaimer in the documentation and/or other materials provided
* You should have received a copy of the GNU General Public License * with the distribution.
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* Additional permission under GNU GPL version 3 section 7 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* If you modify this program, or any covered work, by linking or * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* combining it with the OpenSSL project's OpenSSL library (or a * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* modified version of that library), containing parts covered by the * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* terms of the OpenSSL or SSLeay licenses, We grant you additional * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* permission to convey the resulting work. Corresponding Source for a * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* non-source form of such a combination shall include the source code * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* for the parts of OpenSSL used as well as that of the covered work. * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
ykcs11/ykcs11-version.h.in
+23 -22
View File
@@ -2,28 +2,29 @@
* Copyright (c) 2015 Yubico AB * Copyright (c) 2015 Yubico AB
* All rights reserved. * All rights reserved.
* *
* This program is free software: you can redistribute it and/or modify * Redistribution and use in source and binary forms, with or without
* it under the terms of the GNU General Public License as published by * modification, are permitted provided that the following conditions are
* the Free Software Foundation, either version 3 of the License, or * met:
* (at your option) any later version. *
* * * Redistributions of source code must retain the above copyright
* This program is distributed in the hope that it will be useful, * notice, this list of conditions and the following disclaimer.
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * Redistributions in binary form must reproduce the above
* GNU General Public License for more details. * copyright notice, this list of conditions and the following
* * disclaimer in the documentation and/or other materials provided
* You should have received a copy of the GNU General Public License * with the distribution.
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* Additional permission under GNU GPL version 3 section 7 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* If you modify this program, or any covered work, by linking or * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* combining it with the OpenSSL project's OpenSSL library (or a * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* modified version of that library), containing parts covered by the * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* terms of the OpenSSL or SSLeay licenses, We grant you additional * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* permission to convey the resulting work. Corresponding Source for a * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* non-source form of such a combination shall include the source code * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* for the parts of OpenSSL used as well as that of the covered work. * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
ykcs11/ykcs11.map
+21 -20
View File
@@ -1,28 +1,29 @@
# Copyright (c) 2014 Yubico AB # Copyright (c) 2014 Yubico AB
# All rights reserved. # All rights reserved.
# #
# This program is free software: you can redistribute it and/or modify # Redistribution and use in source and binary forms, with or without
# it under the terms of the GNU General Public License as published by # modification, are permitted provided that the following conditions are
# the Free Software Foundation, either version 3 of the License, or # met:
# (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # * Redistributions of source code must retain the above copyright
# but WITHOUT ANY WARRANTY; without even the implied warranty of # notice, this list of conditions and the following disclaimer.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # * Redistributions in binary form must reproduce the above
# along with this program. If not, see <http://www.gnu.org/licenses/>. # copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided
# with the distribution.
# #
# Additional permission under GNU GPL version 3 section 7 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# If you modify this program, or any covered work, by linking or # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# combining it with the OpenSSL project's OpenSSL library (or a # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# modified version of that library), containing parts covered by the # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# terms of the OpenSSL or SSLeay licenses, We grant you additional # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# permission to convey the resulting work. Corresponding Source for a # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# non-source form of such a combination shall include the source code # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# for the parts of OpenSSL used as well as that of the covered work. # 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.
YKCS11_0.1.0 YKCS11_0.1.0
{ {
@@ -32,4 +33,4 @@ global:
# TODO: add more here # TODO: add more here
local: local:
*; *;
}; };