diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-09-20 15:33:10 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-09-20 15:33:10 +0000 |
| commit | 54315879b33b45668860e406241aa04286044673 (patch) | |
| tree | 4945e473eba69704265c04a253d334612d9fcdce | |
| parent | d5d9278d887ae84062583d588685070571820426 (diff) | |
| parent | f51ae6b9bc32eeacf4018abdaf0a6d1dd1430d72 (diff) | |
| download | gnutls-54315879b33b45668860e406241aa04286044673.tar.gz | |
Merge branch 'tmp-pkcs11-mock' into 'master'
pkcs11-mock: updated license based on upstream project [ci skip]
See merge request gnutls/gnutls!1065
| -rw-r--r-- | tests/pkcs11/pkcs11-mock.c | 26 | ||||
| -rw-r--r-- | tests/pkcs11/pkcs11-mock.h | 25 |
2 files changed, 31 insertions, 20 deletions
diff --git a/tests/pkcs11/pkcs11-mock.c b/tests/pkcs11/pkcs11-mock.c index 7cd6ec2361..0645187ffe 100644 --- a/tests/pkcs11/pkcs11-mock.c +++ b/tests/pkcs11/pkcs11-mock.c @@ -1,16 +1,22 @@ /* - * PKCS11-MOCK - PKCS#11 mock module - * Copyright (c) 2015 JWC s.r.o. <http://www.jwc.sk> - * Author: Jaroslav Imrich <jimrich@jimrich.sk> + * Copyright 2011-2016 The Pkcs11Interop Project * - * Licensing for open source projects: - * PKCS11-MOCK is available under the terms of the GNU Affero General - * Public License version 3 as published by the Free Software Foundation. - * Please see <https://www.gnu.org/licenses/agpl-3.0.html> for more details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensing for other types of projects: - * PKCS11-MOCK is available under the terms of flexible commercial license. - * Please contact JWC s.r.o. at <info@pkcs11interop.net> for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Written originally for the Pkcs11Interop project by: + * Jaroslav IMRICH <jimrich@jimrich.sk> */ #include "pkcs11-mock.h" diff --git a/tests/pkcs11/pkcs11-mock.h b/tests/pkcs11/pkcs11-mock.h index 5997f30ff1..6764c021e6 100644 --- a/tests/pkcs11/pkcs11-mock.h +++ b/tests/pkcs11/pkcs11-mock.h @@ -1,18 +1,23 @@ /* - * PKCS11-MOCK - PKCS#11 mock module - * Copyright (c) 2015 JWC s.r.o. <http://www.jwc.sk> - * Author: Jaroslav Imrich <jimrich@jimrich.sk> + * Copyright 2011-2016 The Pkcs11Interop Project * - * Licensing for open source projects: - * PKCS11-MOCK is available under the terms of the GNU Affero General - * Public License version 3 as published by the Free Software Foundation. - * Please see <https://www.gnu.org/licenses/agpl-3.0.html> for more details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensing for other types of projects: - * PKCS11-MOCK is available under the terms of flexible commercial license. - * Please contact JWC s.r.o. at <info@pkcs11interop.net> for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +/* + * Written originally for the Pkcs11Interop project by: + * Jaroslav IMRICH <jimrich@jimrich.sk> + */ #define _POSIX_C_SOURCE 200809 #include <config.h> |