[git] Pinentry - branch, master, updated. pinentry-1.0.0-36-g622f876
by Werner Koch
cvs at cvs.gnupg.org
Mon Nov 20 10:50:17 CET 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via 622f876784239c9524a598e6486181bcd0ee64b2 (commit)
via 738ab548f13cc032f01ca5da1f8dc3ea221b209d (commit)
from 89ae5378d1cc54be0825bcfa3ea567b1caa4a247 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 622f876784239c9524a598e6486181bcd0ee64b2
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 20 10:45:50 2017 +0100
Add SPDX-License-Identifier to most files
diff --git a/Makefile.am b/Makefile.am
index 1f62939..e11b009 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/configure.ac b/configure.ac
index ea12d56..3de0882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
# (Process this file with autoconf to produce a configure script.)
AC_PREREQ(2.69)
diff --git a/emacs/Makefile.am b/emacs/Makefile.am
index ca0a4dc..c75c93d 100644
--- a/emacs/Makefile.am
+++ b/emacs/Makefile.am
@@ -14,8 +14,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/emacs/pinentry-emacs.c b/emacs/pinentry-emacs.c
index 3c39a96..5750502 100644
--- a/emacs/pinentry-emacs.c
+++ b/emacs/pinentry-emacs.c
@@ -1,21 +1,22 @@
/* pinentry-emacs.c - A secure emacs dialog for PIN entry, library version
- Copyright (C) 2015 Daiki Ueno
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2015 Daiki Ueno
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/fltk/Makefile.am b/fltk/Makefile.am
index 54209f9..598c4c4 100644
--- a/fltk/Makefile.am
+++ b/fltk/Makefile.am
@@ -1,4 +1,5 @@
# Makefile.am - PIN entry FLTK frontend.
+# SPDX-License-Identifier: GPL-2.0+
bin_PROGRAMS = pinentry-fltk
diff --git a/fltk/main.cxx b/fltk/main.cxx
index 1a72c89..8e7e726 100644
--- a/fltk/main.cxx
+++ b/fltk/main.cxx
@@ -18,6 +18,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#ifdef HAVE_CONFIG_H
diff --git a/fltk/passwindow.cxx b/fltk/passwindow.cxx
index 78b3b2c..a0cbe25 100644
--- a/fltk/passwindow.cxx
+++ b/fltk/passwindow.cxx
@@ -20,6 +20,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#include "passwindow.h"
diff --git a/fltk/passwindow.h b/fltk/passwindow.h
index 43813cd..28472d5 100644
--- a/fltk/passwindow.h
+++ b/fltk/passwindow.h
@@ -20,6 +20,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PASSWINDOW_H__
diff --git a/fltk/pinwindow.cxx b/fltk/pinwindow.cxx
index ad11e91..c187dd5 100644
--- a/fltk/pinwindow.cxx
+++ b/fltk/pinwindow.cxx
@@ -20,6 +20,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#include <FL/Fl.H>
diff --git a/fltk/pinwindow.h b/fltk/pinwindow.h
index e1d009e..e1548da 100644
--- a/fltk/pinwindow.h
+++ b/fltk/pinwindow.h
@@ -20,6 +20,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PINWINDOW_H__
diff --git a/fltk/qualitypasswindow.cxx b/fltk/qualitypasswindow.cxx
index 6d7f7cc..4529073 100644
--- a/fltk/qualitypasswindow.cxx
+++ b/fltk/qualitypasswindow.cxx
@@ -19,6 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#include <FL/Fl_Window.H>
diff --git a/fltk/qualitypasswindow.h b/fltk/qualitypasswindow.h
index 164c10d..eee5515 100644
--- a/fltk/qualitypasswindow.h
+++ b/fltk/qualitypasswindow.h
@@ -19,6 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __QUALITYPASSWINDOW_H__
diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am
index 9dc487a..6b7064f 100644
--- a/gnome3/Makefile.am
+++ b/gnome3/Makefile.am
@@ -7,15 +7,15 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# PINENTRY 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.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
index 27d2132..b395676 100644
--- a/gnome3/pinentry-gnome3.c
+++ b/gnome3/pinentry-gnome3.c
@@ -1,22 +1,23 @@
/* pinentry-gnome3.c
- Copyright (C) 2015 g10 Code GmbH
-
- pinentry-gnome-3 is a pinentry application for GNOME 3. It tries
- to follow the Gnome Human Interface Guide as close as possible.
-
- This program 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 2 of the License, or
- (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ * Copyright (C) 2015 g10 Code GmbH
+ *
+ * pinentry-gnome-3 is a pinentry application for GNOME 3. It tries
+ * to follow the Gnome Human Interface Guide as close as possible.
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/gtk+-2/Makefile.am b/gtk+-2/Makefile.am
index e9bff80..a908f81 100644
--- a/gtk+-2/Makefile.am
+++ b/gtk+-2/Makefile.am
@@ -7,15 +7,15 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# PINENTRY 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.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index 89728c4..c803628 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -1,25 +1,26 @@
/* pinentry-gtk-2.c
- Copyright (C) 1999 Robert Bihlmeyer <robbe at orcus.priv.at>
- Copyright (C) 2001, 2002, 2007, 2015 g10 Code GmbH
- Copyright (C) 2004 by Albrecht Dreß <albrecht.dress at arcor.de>
-
- pinentry-gtk-2 is a pinentry application for the Gtk+-2 widget set.
- It tries to follow the Gnome Human Interface Guide as close as
- possible.
-
- This program 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 2 of the License, or
- (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ * Copyright (C) 1999 Robert Bihlmeyer <robbe at orcus.priv.at>
+ * Copyright (C) 2001, 2002, 2007, 2015 g10 Code GmbH
+ * Copyright (C) 2004 by Albrecht Dreß <albrecht.dress at arcor.de>
+ *
+ * pinentry-gtk-2 is a pinentry application for the Gtk+-2 widget set.
+ * It tries to follow the Gnome Human Interface Guide as close as
+ * possible.
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/pinentry/Makefile.am b/pinentry/Makefile.am
index a99f12e..0866cce 100644
--- a/pinentry/Makefile.am
+++ b/pinentry/Makefile.am
@@ -14,8 +14,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/pinentry/argparse.c b/pinentry/argparse.c
index f6c160c..ee9c08b 100644
--- a/pinentry/argparse.c
+++ b/pinentry/argparse.c
@@ -27,6 +27,7 @@
* You should have received a copies of the GNU General Public License
* and the GNU Lesser General Public License along with this program;
* if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: (GPL-2.0+ OR LGPL-3.0+)
*/
/* This file may be used as part of GnuPG or standalone. A GnuPG
diff --git a/pinentry/argparse.h b/pinentry/argparse.h
index 54d9c5b..5b652eb 100644
--- a/pinentry/argparse.h
+++ b/pinentry/argparse.h
@@ -26,6 +26,7 @@
* You should have received a copies of the GNU General Public License
* and the GNU Lesser General Public License along with this program;
* if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: (GPL-2.0+ OR LGPL-3.0+)
*/
#ifndef LIBJNLIB_ARGPARSE_H
diff --git a/pinentry/password-cache.c b/pinentry/password-cache.c
index 06c48b4..0da17b5 100644
--- a/pinentry/password-cache.c
+++ b/pinentry/password-cache.c
@@ -15,6 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <https://www.gnu.org/licenses/>.
+ SPDX-License-Identifier: GPL-2.0+
*/
#ifdef HAVE_CONFIG_H
diff --git a/pinentry/password-cache.h b/pinentry/password-cache.h
index 34fd00b..d7ccfee 100644
--- a/pinentry/password-cache.h
+++ b/pinentry/password-cache.h
@@ -15,6 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <https://www.gnu.org/licenses/>.
+ SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PASSWORD_CACHE_H
diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
index 7c82e0f..89bb5b6 100644
--- a/pinentry/pinentry-curses.c
+++ b/pinentry/pinentry-curses.c
@@ -1,22 +1,22 @@
/* pinentry-curses.c - A secure curses dialog for PIN entry, library version
- Copyright (C) 2002, 2015 g10 Code GmbH
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 2002, 2015 g10 Code GmbH
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/pinentry/pinentry-curses.h b/pinentry/pinentry-curses.h
index e05593f..b33f134 100644
--- a/pinentry/pinentry-curses.h
+++ b/pinentry/pinentry-curses.h
@@ -1,23 +1,22 @@
/* pinentry-curses.h - A secure curses dialog for PIN entry, library version
- Copyright (C) 2002 g10 Code GmbH
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
-
+ * Copyright (C) 2002 g10 Code GmbH
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifndef PINENTRY_CURSES_H
#define PINENTRY_CURSES_H
diff --git a/pinentry/pinentry-emacs.c b/pinentry/pinentry-emacs.c
index 2f7693b..190ea9d 100644
--- a/pinentry/pinentry-emacs.c
+++ b/pinentry/pinentry-emacs.c
@@ -1,21 +1,22 @@
/* pinentry-emacs.c - A secure emacs dialog for PIN entry, library version
- Copyright (C) 2015 Daiki Ueno
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2015 Daiki Ueno
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/pinentry/pinentry-emacs.h b/pinentry/pinentry-emacs.h
index 24dabb9..00b4413 100644
--- a/pinentry/pinentry-emacs.h
+++ b/pinentry/pinentry-emacs.h
@@ -1,21 +1,22 @@
/* pinentry-emacs.c - A secure emacs dialog for PIN entry, library version
- Copyright (C) 2015 Daiki Ueno
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2015 Daiki Ueno
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifndef PINENTRY_EMACS_H
#define PINENTRY_EMACS_H
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index ac3a323..17b994d 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1,20 +1,21 @@
/* pinentry.c - The PIN entry support library
- Copyright (C) 2002, 2003, 2007, 2008, 2010, 2015, 2016 g10 Code GmbH
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * Copyright (C) 2002, 2003, 2007, 2008, 2010, 2015, 2016 g10 Code GmbH
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifdef HAVE_CONFIG_H
diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h
index 128331c..009e884 100644
--- a/pinentry/pinentry.h
+++ b/pinentry/pinentry.h
@@ -1,20 +1,21 @@
/* pinentry.h - The interface for the PIN entry support library.
- Copyright (C) 2002, 2003, 2010, 2015 g10 Code GmbH
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * Copyright (C) 2002, 2003, 2010, 2015 g10 Code GmbH
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PINENTRY_H
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 6659007..698005e 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/qt/main.cpp b/qt/main.cpp
index 7d1a264..70a009d 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -1,27 +1,26 @@
/* main.cpp - A Qt dialog for PIN entry.
-
- Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
- Copyright (C) 2003 g10 Code GmbH
- Copyright 2007 Ingo Klöcker
-
- Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
- Modified by Marcus Brinkmann <marcus at g10code.de>.
- Modified by Marc Mutz <marc at kdab.com>
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+ * Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
+ * Copyright (C) 2003 g10 Code GmbH
+ * Copyright 2007 Ingo Klöcker
+ *
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
+ * Modified by Marcus Brinkmann <marcus at g10code.de>.
+ * Modified by Marc Mutz <marc at kdab.com>
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/qt/pinentryconfirm.cpp b/qt/pinentryconfirm.cpp
index 50c19a4..65b191c 100644
--- a/qt/pinentryconfirm.cpp
+++ b/qt/pinentryconfirm.cpp
@@ -1,21 +1,22 @@
/* pinentryconfirm.cpp - A QMessageBox with a timeout
+ *
+ * Copyright (C) 2011 Ben Kibbey <bjk at luxsci.net>
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
- Copyright (C) 2011 Ben Kibbey <bjk at luxsci.net>
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
#include "pinentryconfirm.h"
#include "pinentrydialog.h"
#include <QAbstractButton>
diff --git a/qt/pinentryconfirm.h b/qt/pinentryconfirm.h
index 21b91c5..ec116ac 100644
--- a/qt/pinentryconfirm.h
+++ b/qt/pinentryconfirm.h
@@ -1,21 +1,22 @@
/* pinentryconfirm.h - A QMessageBox with a timeout
+ *
+ * Copyright (C) 2011 Ben Kibbey <bjk at luxsci.net>
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
- Copyright (C) 2011 Ben Kibbey <bjk at luxsci.net>
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
#ifndef PINENTRYCONFIRM_H
#define PINENTRYCONFIRM_H
diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
index 92cf19e..cb52d7c 100644
--- a/qt/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -1,26 +1,25 @@
/* pinentrydialog.cpp - A (not yet) secure Qt 4 dialog for PIN entry.
-
- Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
- Copyright 2007 Ingo Klöcker
- Copyright 2016 Intevation GmbH
-
- Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
- Modified by Andre Heinecke <aheinecke at intevation.de>
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+ * Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
+ * Copyright 2007 Ingo Klöcker
+ * Copyright 2016 Intevation GmbH
+ *
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
+ * Modified by Andre Heinecke <aheinecke at intevation.de>
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#include "pinentrydialog.h"
#include <QGridLayout>
diff --git a/qt/pinentrydialog.h b/qt/pinentrydialog.h
index 905be0f..52b7343 100644
--- a/qt/pinentrydialog.h
+++ b/qt/pinentrydialog.h
@@ -1,26 +1,25 @@
/* pinentrydialog.h - A (not yet) secure Qt 4 dialog for PIN entry.
-
- Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
- Copyright 2007 Ingo Klöcker
- Copyright 2016 Intevation GmbH
-
- Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
- Modified by Andre Heinecke <aheinecke at intevation.de>
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+ * Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
+ * Copyright 2007 Ingo Klöcker
+ * Copyright 2016 Intevation GmbH
+ *
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
+ * Modified by Andre Heinecke <aheinecke at intevation.de>
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifndef __PINENTRYDIALOG_H__
#define __PINENTRYDIALOG_H__
diff --git a/secmem/Makefile.am b/secmem/Makefile.am
index e5e0711..9e176e7 100644
--- a/secmem/Makefile.am
+++ b/secmem/Makefile.am
@@ -14,8 +14,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/secmem/memory.h b/secmem/memory.h
index 354c6c9..75fe708 100644
--- a/secmem/memory.h
+++ b/secmem/memory.h
@@ -2,19 +2,19 @@
* Copyright (C) 1998,1999 Free Software Foundation, Inc.
* Copyright (C) 1999,2000 Robert Bihlmeyer <robbe at orcus.priv.at>
*
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
*
- * This program 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.
+ * This program 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MEMORY_H
@@ -24,7 +24,7 @@
#ifdef __cplusplus
extern "C" {
-#if 0
+#if 0
}
#endif
#endif
@@ -46,7 +46,7 @@ void secmem_set_flags( unsigned flags );
unsigned secmem_get_flags(void);
size_t secmem_get_max_size (void);
-#if 0
+#if 0
{
#endif
#ifdef __cplusplus
diff --git a/secmem/secmem++.h b/secmem/secmem++.h
index 88a5d45..b0aa9e9 100644
--- a/secmem/secmem++.h
+++ b/secmem/secmem++.h
@@ -1,19 +1,19 @@
/* STL allocator for secmem
* Copyright (C) 2008 Marc Mutz <marc at kdab.com>
*
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
*
- * This program 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.
+ * This program 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SECMEM_SECMEMPP_H__
diff --git a/secmem/secmem.c b/secmem/secmem.c
index 7a3bd4b..3abcc4a 100644
--- a/secmem/secmem.c
+++ b/secmem/secmem.c
@@ -1,6 +1,6 @@
/* secmem.c - memory allocation from a secure heap
- * Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
- * Copyright (C) 2015 g10 Code GmbH
+ * Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2015 g10 Code GmbH
*
* This file is part of GnuPG.
*
@@ -15,8 +15,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <config.h>
@@ -61,21 +61,21 @@ typedef union {
#define log_error log_info
#define log_bug log_fatal
-void
+void
log_info(char *template, ...)
{
va_list args;
-
+
va_start(args, template);
vfprintf(stderr, template, args);
va_end(args);
}
-void
+void
log_fatal(char *template, ...)
{
va_list args;
-
+
va_start(args, template);
vfprintf(stderr, template, args);
va_end(args);
@@ -456,7 +456,7 @@ secmem_dump_stats()
}
-size_t
+size_t
secmem_get_max_size (void)
{
return poolsize;
diff --git a/secmem/util.c b/secmem/util.c
index 31bea01..44609cf 100644
--- a/secmem/util.c
+++ b/secmem/util.c
@@ -1,19 +1,19 @@
/* Quintuple Agent
* Copyright (C) 1999 Robert Bihlmeyer <robbe at orcus.priv.at>
*
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
*
- * This program 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.
+ * This program 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifdef HAVE_CONFIG_H
diff --git a/secmem/util.h b/secmem/util.h
index 7986c99..233ab13 100644
--- a/secmem/util.h
+++ b/secmem/util.h
@@ -2,19 +2,19 @@
* Copyright (C) 1999 Robert Bihlmeyer <robbe at orcus.priv.at>
* Copyright (C) 2003 g10 Code GmbH
*
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
*
- * This program 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.
+ * This program 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _UTIL_H
@@ -23,18 +23,18 @@
#include <sys/types.h>
#ifndef HAVE_BYTE_TYPEDEF
-# undef byte
+# undef byte
# ifdef __riscos__
/* Norcroft treats char == unsigned char but char* != unsigned char* */
typedef char byte;
-# else
+# else
typedef unsigned char byte;
-# endif
+# endif
# define HAVE_BYTE_TYPEDEF
#endif
#ifndef HAVE_ULONG_TYPEDEF
-# undef ulong
+# undef ulong
typedef unsigned long ulong;
# define HAVE_ULONG_TYPEDEF
#endif
diff --git a/tty/Makefile.am b/tty/Makefile.am
index 1e8ffb5..7844bcb 100644
--- a/tty/Makefile.am
+++ b/tty/Makefile.am
@@ -15,6 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
index 0e9ab4b..700b0f1 100644
--- a/tty/pinentry-tty.c
+++ b/tty/pinentry-tty.c
@@ -1,22 +1,23 @@
/* pinentry-tty.c - A minimalist dumb terminal mechanism for PIN entry
- Copyright (C) 2014 Serge Voilokov
- Copyright (C) 2015 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
- Copyright (C) 2015 g10 Code GmbH
-
- This file is part of PINENTRY.
-
- PINENTRY 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 2 of the License, or
- (at your option) any later version.
-
- PINENTRY 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * Copyright (C) 2014 Serge Voilokov
+ * Copyright (C) 2015 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+ * Copyright (C) 2015 g10 Code GmbH
+ *
+ * This file is part of PINENTRY.
+ *
+ * PINENTRY 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PINENTRY 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifdef HAVE_CONFIG_H
diff --git a/w32/Makefile.am b/w32/Makefile.am
index 160d375..12c66db 100644
--- a/w32/Makefile.am
+++ b/w32/Makefile.am
@@ -14,8 +14,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/w32/main.c b/w32/main.c
index b35879d..0b3d702 100644
--- a/w32/main.c
+++ b/w32/main.c
@@ -1,20 +1,20 @@
/* main.c - Secure W32 dialog for PIN entry.
- Copyright (C) 2004, 2007 g10 Code GmbH
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 2004, 2007 g10 Code GmbH
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#include <config.h>
#include <stdio.h>
diff --git a/w32/pinentry-w32.rc b/w32/pinentry-w32.rc
index e46ad74..bc3dacb 100755
--- a/w32/pinentry-w32.rc
+++ b/w32/pinentry-w32.rc
@@ -1,20 +1,20 @@
/* dialog.rc - Resource definitions -*- c -*-
- Copyright (C) 2004, 2010 g10 Code GmbH
-
- This program 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 2 of the
- License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 2004, 2010 g10 Code GmbH
+ *
+ * This program 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#include <config.h>
#include <winuser.h>
diff --git a/w32/resource.h b/w32/resource.h
index a8a285e..4311bf3 100644
--- a/w32/resource.h
+++ b/w32/resource.h
@@ -8,6 +8,7 @@
* This file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * SPDX-License-Identifier: FSFULLR
*/
#define IDD_PINENT 101
commit 738ab548f13cc032f01ca5da1f8dc3ea221b209d
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 20 10:45:17 2017 +0100
Add copyright info for AUTHORS
diff --git a/AUTHORS b/AUTHORS
index b526ce6..317b17e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,20 @@ License copyright years may be listed using range notation, e.g.,
2000-2016, indicating that every year in the range, inclusive, is a
copyrightable year that would otherwise be listed individually.
+List of Copyright holders
+=========================
+
+Copyright (C) 1999 Robert Bihlmeyer <robbe at orcus.priv.at>
+Copyright (C) 2001-2004, 2007-2008, 2010, 2015-2017 g10 Code GmbH
+Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
+Copyright (C) 2004 by Albrecht Dreß <albrecht.dress at arcor.de>
+Copyright 2007 Ingo Klöcker
+Copyright (C) 2014 Serge Voilokov
+Copyright (C) 2015 Daiki Ueno
+Copyright (C) 2015 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Copyright 2016 Intevation GmbH
+Copyright (C) 2016 Anatoly madRat L. Berenblit
+
Authors
-------
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 14 ++++++++++++++
Makefile.am | 4 ++--
configure.ac | 4 ++--
emacs/Makefile.am | 4 ++--
emacs/pinentry-emacs.c | 35 ++++++++++++++++++-----------------
fltk/Makefile.am | 1 +
fltk/main.cxx | 1 +
fltk/passwindow.cxx | 1 +
fltk/passwindow.h | 1 +
fltk/pinwindow.cxx | 1 +
fltk/pinwindow.h | 1 +
fltk/qualitypasswindow.cxx | 1 +
fltk/qualitypasswindow.h | 1 +
gnome3/Makefile.am | 8 ++++----
gnome3/pinentry-gnome3.c | 37 +++++++++++++++++++------------------
gtk+-2/Makefile.am | 8 ++++----
gtk+-2/pinentry-gtk-2.c | 43 ++++++++++++++++++++++---------------------
pinentry/Makefile.am | 4 ++--
pinentry/argparse.c | 1 +
pinentry/argparse.h | 1 +
pinentry/password-cache.c | 1 +
pinentry/password-cache.h | 1 +
pinentry/pinentry-curses.c | 36 ++++++++++++++++++------------------
pinentry/pinentry-curses.h | 37 ++++++++++++++++++-------------------
pinentry/pinentry-emacs.c | 35 ++++++++++++++++++-----------------
pinentry/pinentry-emacs.h | 35 ++++++++++++++++++-----------------
pinentry/pinentry.c | 33 +++++++++++++++++----------------
pinentry/pinentry.h | 33 +++++++++++++++++----------------
qt/Makefile.am | 4 ++--
qt/main.cpp | 45 ++++++++++++++++++++++-----------------------
qt/pinentryconfirm.cpp | 33 +++++++++++++++++----------------
qt/pinentryconfirm.h | 33 +++++++++++++++++----------------
qt/pinentrydialog.cpp | 43 +++++++++++++++++++++----------------------
qt/pinentrydialog.h | 43 +++++++++++++++++++++----------------------
secmem/Makefile.am | 4 ++--
secmem/memory.h | 26 +++++++++++++-------------
secmem/secmem++.h | 22 +++++++++++-----------
secmem/secmem.c | 18 +++++++++---------
secmem/util.c | 22 +++++++++++-----------
secmem/util.h | 30 +++++++++++++++---------------
tty/Makefile.am | 1 +
tty/pinentry-tty.c | 37 +++++++++++++++++++------------------
w32/Makefile.am | 4 ++--
w32/main.c | 32 ++++++++++++++++----------------
w32/pinentry-w32.rc | 32 ++++++++++++++++----------------
w32/resource.h | 1 +
46 files changed, 423 insertions(+), 389 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list