summaryrefslogtreecommitdiff
path: root/lib/x509
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2020-06-18 07:05:48 +0000
committerDaiki Ueno <ueno@gnu.org>2020-06-18 07:05:48 +0000
commit974b1ac12fc0d91ad64e4f9174b98601ab10df91 (patch)
treed2a975393f9e0336219577126657063977ec0de4 /lib/x509
parent24c13fcd18a91f674652dc231bf0862ac8b7cd0f (diff)
parenta5f05cd4bc2bae3803e7cf8d7ae3dfa9abb34110 (diff)
downloadgnutls-974b1ac12fc0d91ad64e4f9174b98601ab10df91.tar.gz
Merge branch 'master' into 'master'
issues #1018- Modied the license to GPLv2.1+ to keep with LICENSE file. See merge request gnutls/gnutls!1285
Diffstat (limited to 'lib/x509')
-rw-r--r--lib/x509/krb5.c20
-rw-r--r--lib/x509/krb5.h20
2 files changed, 22 insertions, 18 deletions
diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c
index 7fe84e651d..d68c737570 100644
--- a/lib/x509/krb5.c
+++ b/lib/x509/krb5.c
@@ -1,21 +1,23 @@
/*
* Copyright (C) 2015 Red Hat, Inc.
*
+ * Author: Nikos Mavrogiannopoulos
+ *
* This file is part of GnuTLS.
*
- * GnuTLS is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * The GnuTLS 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.
*
- * GnuTLS is distributed in the hope that it will be useful, but
+ * 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
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
- * <https://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/lib/x509/krb5.h b/lib/x509/krb5.h
index d8926af67a..815bb28f72 100644
--- a/lib/x509/krb5.h
+++ b/lib/x509/krb5.h
@@ -1,21 +1,23 @@
/*
* Copyright (C) 2015 Red Hat, Inc.
*
+ * Author: Nikos Mavrogiannopoulos
+ *
* This file is part of GnuTLS.
*
- * GnuTLS is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * The GnuTLS 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.
*
- * GnuTLS is distributed in the hope that it will be useful, but
+ * 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
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
- * <https://www.gnu.org/licenses/>.
*/
#ifndef GNUTLS_LIB_X509_KRB5_H