Add an SPDX tag to all core files.

--

56 files changed, 633 insertions, 580 deletions

diff --git a/Makefile.am b/Makefile.am
index 4ffb113..ba01f60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: LGPL-2.1+
 ## Process this file with automake to produce Makefile.in
 
 
diff --git a/configure.ac b/configure.ac
index 118e047..731449d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: LGPL-2.1+
 
 # Process this file with autoconf to produce a configure script.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8feef3a..f353e29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,8 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: LGPL-2.1+
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = libassuan-config.in libassuan.m4 libassuan.vers \
diff --git a/src/assuan-buffer.c b/src/assuan-buffer.c
index ef9ba41..be87280 100644
--- a/src/assuan-buffer.c
+++ b/src/assuan-buffer.c
@@ -1,20 +1,22 @@
 /* assuan-buffer.c - read and send data
-   Copyright (C) 2001-2004, 2006, 2009, 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2001-2004, 2006, 2009, 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #include <config.h>
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index 97b053d..6688198 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -1,21 +1,22 @@
 /* assuan-defs.h - Internal definitions to Assuan
-   Copyright (C) 2001, 2002, 2004, 2005, 2007, 2008,
-                 2009, 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2001, 2002, 2004, 2005, 2007, 2008,
+ *               2009, 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifndef ASSUAN_DEFS_H
diff --git a/src/assuan-error.c b/src/assuan-error.c
index cc1ff5c..8799203 100644
--- a/src/assuan-error.c
+++ b/src/assuan-error.c
@@ -1,20 +1,21 @@
 /* assuan-error.c
-   Copyright (C) 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index dec0f1b..2299fcd 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -1,21 +1,22 @@
 /* assuan-handler.c - dispatch commands
-   Copyright (C) 2001, 2002, 2003, 2007, 2009,
-                 2011 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2001, 2002, 2003, 2007, 2009,
+ *               2011 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan-inquire.c b/src/assuan-inquire.c
index f863935..fa227a6 100644
--- a/src/assuan-inquire.c
+++ b/src/assuan-inquire.c
@@ -1,20 +1,21 @@
 /* assuan-inquire.c - handle inquire stuff
-   Copyright (C) 2001-2003, 2005, 2007, 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2001-2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan-io.c b/src/assuan-io.c
index 8bb8ed9..b3b22fd 100644
--- a/src/assuan-io.c
+++ b/src/assuan-io.c
@@ -1,20 +1,21 @@
 /* assuan-io.c - Wraps the read and write functions.
-   Copyright (C) 2002, 2004, 2006-2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2002, 2004, 2006-2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +39,7 @@
 #ifdef HAVE_W32_SYSTEM
 # ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
-# endif 
+# endif
 # include <windows.h>
 #else
 # include <sys/wait.h>
diff --git a/src/assuan-listen.c b/src/assuan-listen.c
index 2c589ab..6755d59 100644
--- a/src/assuan-listen.c
+++ b/src/assuan-listen.c
@@ -1,20 +1,21 @@
-/* assuan-listen.c - Wait for a connection (server) 
-   Copyright (C) 2001, 2002, 2004, 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+/* assuan-listen.c - Wait for a connection (server)
+ * Copyright (C) 2001, 2002, 2004, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
@@ -63,11 +64,11 @@ assuan_set_hello_line (assuan_context_t ctx, const char *line)
 /**
  * assuan_accept:
  * @ctx: context
- * 
+ *
  * Cancel any existing connection and wait for a connection from a
  * client.  The initial handshake is performed which may include an
  * initial authentication or encryption negotiation.
- * 
+ *
  * Return value: 0 on success or an error if the connection could for
  * some reason not be established.
  **/
@@ -128,7 +129,7 @@ assuan_accept (assuan_context_t ctx)
     }
   if (rc)
     return rc;
-    
+
   return 0;
 }
 
diff --git a/src/assuan-logging.c b/src/assuan-logging.c
index fd47582..8ee6aa2 100644
--- a/src/assuan-logging.c
+++ b/src/assuan-logging.c
@@ -1,21 +1,22 @@
 /* assuan-logging.c - Default logging function.
-   Copyright (C) 2002, 2003, 2004, 2007, 2009,
-                 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2002, 2003, 2004, 2007, 2009,
+ *               2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c
index a657c94..1589d79 100644
--- a/src/assuan-pipe-connect.c
+++ b/src/assuan-pipe-connect.c
@@ -1,21 +1,22 @@
 /* assuan-pipe-connect.c - Establish a pipe connection (client)
-   Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010,
-                 2011 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010,
+ *               2011 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan-pipe-server.c b/src/assuan-pipe-server.c
index 017dc7b..c78abcd 100644
--- a/src/assuan-pipe-server.c
+++ b/src/assuan-pipe-server.c
@@ -1,20 +1,21 @@
-/* assuan-pipe-server.c - Assuan server working over a pipe 
-   Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+/* assuan-pipe-server.c - Assuan server working over a pipe
+ * Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
@@ -35,7 +36,7 @@
 #ifdef HAVE_W32_SYSTEM
 # ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
-# endif 
+# endif
 # include <windows.h>
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -75,7 +76,7 @@ assuan_init_pipe_server (assuan_context_t ctx, assuan_fd_t filedes[2])
     {
       TRACE_LOG2 ("fd[0]=0x%x, fd[1]=0x%x", filedes[0], filedes[1]);
     }
-  
+
   rc = _assuan_register_std_commands (ctx);
   if (rc)
     return TRACE_ERR (rc);
@@ -95,7 +96,7 @@ assuan_init_pipe_server (assuan_context_t ctx, assuan_fd_t filedes[2])
       is_usd = 1;
 
     }
-  else if (filedes && filedes[0] != ASSUAN_INVALID_FD 
+  else if (filedes && filedes[0] != ASSUAN_INVALID_FD
 	   && filedes[1] != ASSUAN_INVALID_FD )
     {
       /* Standard pipe server. */
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 3d3176e..c54c44d 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -1,20 +1,21 @@
 /* assuan-socket-connect.c - Assuan socket based client
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #include <config.h>
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index 964720b..a5b7fd7 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -1,20 +1,21 @@
 /* assuan-socket-server.c - Assuan socket based server
-   Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
@@ -36,7 +37,7 @@
 #ifdef HAVE_W32_SYSTEM
 # ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
-# endif 
+# endif
 # include <windows.h>
 # if HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
@@ -122,7 +123,7 @@ accept_connection_bottom (assuan_context_t ctx)
   ctx->outbound.fd = fd;
   ctx->outbound.data.linelen = 0;
   ctx->outbound.data.error = 0;
-  
+
   ctx->flags.confidential = 0;
 
   return 0;
@@ -136,16 +137,16 @@ accept_connection (assuan_context_t ctx)
   struct sockaddr_un clnt_addr;
   socklen_t len = sizeof clnt_addr;
 
-  TRACE1 (ctx, ASSUAN_LOG_SYSIO, "accept_connection", ctx, 
+  TRACE1 (ctx, ASSUAN_LOG_SYSIO, "accept_connection", ctx,
          "listen_fd=0x%x", ctx->listen_fd);
 
-  fd = SOCKET2HANDLE(accept (HANDLE2SOCKET(ctx->listen_fd), 
+  fd = SOCKET2HANDLE(accept (HANDLE2SOCKET(ctx->listen_fd),
                              (struct sockaddr*)&clnt_addr, &len ));
   if (fd == ASSUAN_INVALID_FD)
     {
       return _assuan_error (ctx, gpg_err_code_from_syserror ());
     }
-  TRACE1 (ctx, ASSUAN_LOG_SYSIO, "accept_connection", ctx, 
+  TRACE1 (ctx, ASSUAN_LOG_SYSIO, "accept_connection", ctx,
           "fd->0x%x", fd);
   if (_assuan_sock_check_nonce (ctx, fd, &ctx->listen_nonce))
     {
@@ -158,7 +159,7 @@ accept_connection (assuan_context_t ctx)
 }
 
 
-/* 
+/*
    Flag bits: 0 - use sendmsg/recvmsg to allow descriptor passing
               1 - FD has already been accepted.
 */
@@ -169,7 +170,7 @@ assuan_init_socket_server (assuan_context_t ctx, assuan_fd_t fd,
   gpg_error_t rc;
   TRACE_BEG2 (ctx, ASSUAN_LOG_CTX, "assuan_init_socket_server", ctx,
 	      "fd=0x%x, flags=0x%x", fd, flags);
-  
+
   rc = _assuan_register_std_commands (ctx);
   if (rc)
     return TRACE_ERR (rc);
@@ -202,7 +203,7 @@ assuan_init_socket_server (assuan_context_t ctx, assuan_fd_t fd,
       ctx->connected_fd = ASSUAN_INVALID_FD;
     }
   ctx->accept_handler = ((flags & ASSUAN_SOCKET_SERVER_ACCEPTED)
-                         ? accept_connection_bottom 
+                         ? accept_connection_bottom
                          : accept_connection);
   ctx->finish_handler = _assuan_server_finish;
 
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index 147ec2a..adcd40a 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -1,21 +1,22 @@
 /* assuan-socket.c - Socket wrapper
-   Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
-   Copyright (C) 2001-2015 g10 Code GmbH
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2015 g10 Code GmbH
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan-uds.c b/src/assuan-uds.c
index 59f3a6b..8712b02 100644
--- a/src/assuan-uds.c
+++ b/src/assuan-uds.c
@@ -1,20 +1,21 @@
 /* assuan-uds.c - Assuan unix domain socket utilities
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/assuan.c b/src/assuan.c
index d4c4b56..e59df65 100644
--- a/src/assuan.c
+++ b/src/assuan.c
@@ -1,21 +1,22 @@
 /* assuan.c - Global interface (not specific to context).
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Copyright (C) 2001, 2002, 2012, 2013 g10 Code GmbH
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2012, 2013 g10 Code GmbH
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/assuan.h.in b/src/assuan.h.in
index da1af25..acd4f45 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -1,23 +1,24 @@
 /* assuan.h - Definitions for the Assuan IPC library             -*- c -*-
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
-   Copyright (C) 2001-2015 g10 Code GmbH
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
-
-   @configure_input@
+ * Copyright (C) 2001-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2015 g10 Code GmbH
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
+ *
+ * @configure_input@
  */
 
 #ifndef ASSUAN_H
diff --git a/src/client.c b/src/client.c
index de0e88b..8b357e6 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,20 +1,21 @@
 /* client.c - Functions common to all clients.
-   Copyright (C) 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/context.c b/src/context.c
index 147edae..82166bb 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,20 +1,21 @@
 /* context.c - Context specific interface.
-   Copyright (C) 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/conversion.c b/src/conversion.c
index 88a7fd0..a86e5a9 100644
--- a/src/conversion.c
+++ b/src/conversion.c
@@ -1,23 +1,23 @@
 /* conversion.c - String conversion helper functions.
-   Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009 g10 Code GmbH
- 
-   This file is part of Assuan.
-
-   Assuan 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.
-   
-   Assuan 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
-   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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+ * Copyright (C) 2000 Werner Koch (dd9jn)
+ * Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009 g10 Code GmbH
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
+ */
 
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -57,7 +57,7 @@ _assuan_encode_c_string (assuan_context_t ctx, const char *src)
   const unsigned char *istr;
   char *res;
   char *ostr;
-  
+
   ostr = _assuan_malloc (ctx, 4 * strlen (src) + 1);
   if (! *ostr)
     return NULL;
diff --git a/src/debug.h b/src/debug.h
index 5ce0f07..78bbc23 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,22 +1,22 @@
 /* debug.h - interface to debugging functions
-   Copyright (C) 2002, 2004, 2005, 2007 g10 Code GmbH
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+ * Copyright (C) 2002, 2004, 2005, 2007 g10 Code GmbH
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
+ */
 
 #ifndef DEBUG_H
 #define DEBUG_H
diff --git a/src/funopen.c b/src/funopen.c
index e6d77e3..466d9aa 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/gpgcedev.c b/src/gpgcedev.c
index bff4655..c841ec2 100644
--- a/src/gpgcedev.c
+++ b/src/gpgcedev.c
@@ -1,23 +1,23 @@
 /* gpgcedrv.c - WindowsCE device driver to implement pipe and syslog.
-   Copyright (C) 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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 3 of
-   the License, or (at your option) any later version.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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 3 of
+ * the License, or (at your option) any later version.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-3.0+
  */
 
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -48,7 +48,7 @@
 #define GPGCEDEV_IOCTL_GET_RVID \
   CTL_CODE (FILE_DEVICE_STREAMS, 2048, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
-/* The IOCTL used to create the pipe. 
+/* The IOCTL used to create the pipe.
 
    The caller sends this IOCTL to the read or the write handle.  The
    required inbuf parameter is address of a variable holding the
@@ -85,7 +85,7 @@ struct pipeimpl_s
   CRITICAL_SECTION critsect;  /* Lock for all members.  */
 
   int refcnt;
-  char *buffer;       
+  char *buffer;
   size_t buffer_size;
   size_t buffer_len;  /* The valid length of the bufer.  */
   size_t buffer_pos;  /* The actual read position.  */
@@ -98,7 +98,7 @@ struct pipeimpl_s
   int flags;
 
   HANDLE space_available; /* Set if space is available.  */
-  HANDLE data_available;  /* Set if data is available.  */ 
+  HANDLE data_available;  /* Set if data is available.  */
 
   /* For the monitor thread started by ASSIGN_RVID.  */
   HANDLE monitor_proc;
@@ -198,7 +198,7 @@ log_debug (const char *fmt, ...)
     {
       va_list arg_ptr;
       FILE *fp;
-      
+
       fp = fopen (DBGFILENAME, "a+");
       if (!fp)
         return;
@@ -375,7 +375,7 @@ logimpl_flush (logimpl_t limpl)
       char buf[50];
       DWORD nwritten;
 
-      snprintf (buf, sizeof buf, 
+      snprintf (buf, sizeof buf,
                 "%06lu/%lu//", limpl->dsec % 1000000, limpl->logid);
       if (!WriteFile (logcontrol.filehd, buf, strlen (buf), &nwritten, NULL))
         log_debug ("error writing log file: rc=%d\n", (int)GetLastError ());
@@ -633,7 +633,7 @@ wchar_to_utf8 (const wchar_t *string)
   n = WideCharToMultiByte (CP_ACP, 0, string, length, result, n, NULL, NULL);
   if (n < 0)
     abort ();
-  
+
   result[n] = 0;
   return result;
 }
@@ -688,7 +688,7 @@ GPG_Init (LPCTSTR active_key, DWORD bus_context)
 
   if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, active_key, 0, KEY_READ, &handle))
     {
-      log_debug ("GPG_Init: error reading registry: rc=%d\n", 
+      log_debug ("GPG_Init: error reading registry: rc=%d\n",
                  (int)GetLastError ());
       return 0;
     }
@@ -696,7 +696,7 @@ GPG_Init (LPCTSTR active_key, DWORD bus_context)
   buflen = sizeof buffer;
   if (RegQueryValueEx (handle, L"Name", 0, NULL, (PBYTE)buffer, &buflen))
     {
-      log_debug ("GPG_Init: error reading registry value 'Name': rc=%d\n", 
+      log_debug ("GPG_Init: error reading registry value 'Name': rc=%d\n",
                  (int)GetLastError ());
       result = 0;
     }
@@ -757,7 +757,7 @@ GPG_Deinit (DWORD devctx)
       SetLastError (ERROR_INVALID_PARAMETER);
       return FALSE; /* Error.  */
     }
-  
+
   return TRUE; /* Success.  */
 }
 
@@ -939,7 +939,7 @@ GPG_Read (DWORD opnctx_arg, void *buffer, DWORD count)
       EnterCriticalSection (&pimpl->critsect);
       goto retry;
     }
-  
+
   dst = buffer;
   src = pimpl->buffer + pimpl->buffer_pos;
   while (count > 0 && pimpl->buffer_pos < pimpl->buffer_len)
@@ -951,7 +951,7 @@ GPG_Read (DWORD opnctx_arg, void *buffer, DWORD count)
   result = (dst - (char*)buffer);
   if (pimpl->buffer_pos == pimpl->buffer_len)
     pimpl->buffer_pos = pimpl->buffer_len = 0;
-  
+
   /* Now there should be some space available.  Signal the write end.
      Even if COUNT was passed as NULL and no space is available,
      signaling must be done.  */
@@ -1029,7 +1029,7 @@ GPG_Write (DWORD opnctx_arg, const void *buffer, DWORD count)
           SetLastError (ERROR_BROKEN_PIPE);
           goto leave;
         }
-      
+
       /* Check for request to unblock once.  */
       if (pimpl->flags & PIPE_FLAG_UNBLOCK_WRITER)
         {
@@ -1040,7 +1040,7 @@ GPG_Write (DWORD opnctx_arg, const void *buffer, DWORD count)
           result = -1;
           goto leave;
         }
-      
+
       /* Write to our buffer.  */
       if (pimpl->buffer_len == pimpl->buffer_size)
         {
@@ -1055,7 +1055,7 @@ GPG_Write (DWORD opnctx_arg, const void *buffer, DWORD count)
           EnterCriticalSection (&pimpl->critsect);
           goto retry;
         }
-      
+
       src = buffer;
       dst = pimpl->buffer + pimpl->buffer_len;
       while (count > 0 && pimpl->buffer_len < pimpl->buffer_size)
@@ -1066,12 +1066,12 @@ GPG_Write (DWORD opnctx_arg, const void *buffer, DWORD count)
           nwritten++;
         }
       result = nwritten;
-      
+
       if (!SetEvent (pimpl->data_available))
         log_debug ("GPG_Write (ctx=%i): warning: SetEvent(data_available) "
                    "failed: rc=%d\n", opnctx_arg, (int)GetLastError ());
     }
-  
+
   log_debug ("GPG_Write (ctx=%i): success: result=%d\n", opnctx_arg, result);
 
  leave:
@@ -1162,7 +1162,7 @@ make_pipe (opnctx_t ctx, LONG rvid)
 	  SetLastError (ERROR_INVALID_ACCESS);
 	  return FALSE;
 	}
-      
+
       /* Make sure the peer has a pipe implementation to be shared.  If
 	 not yet, create one.  */
       pimpl = assert_pipeimpl (peerctx);
@@ -1175,7 +1175,7 @@ make_pipe (opnctx_t ctx, LONG rvid)
 	 monitor, and the pipe is already closed at the parent side.
 	 For example GPGME verify detached plain text, where GPG calls
 	 MAKE_PIPE very late.  */
-      
+
       for (idx = 0; idx < monitor_table_size; idx++)
 	if (monitor_table[idx].inuse
 	    && monitor_table[idx].pipeimpl->monitor_rvid == rvid)
@@ -1278,7 +1278,7 @@ unblock_call (opnctx_t ctx)
 }
 
 
-static DWORD CALLBACK 
+static DWORD CALLBACK
 monitor_main (void *arg)
 {
   pipeimpl_t pimpl = (pipeimpl_t) arg;
@@ -1286,7 +1286,7 @@ monitor_main (void *arg)
   int idx;
 
   log_debug ("starting monitor (pimpl=0x%p)\n", pimpl);
-  
+
   EnterCriticalSection (&pimpl->critsect);
   /* Putting proc first in the array is convenient, as this is a hard
      break-out condition (and thus takes precedence in WFMO).  The
@@ -1304,7 +1304,7 @@ monitor_main (void *arg)
     {
       log_debug ("monitor (pimpl=0x%p): done: monitored process taking over\n",
 		 pimpl);
-    }    
+    }
   else
     {
       DWORD res;
@@ -1324,7 +1324,7 @@ monitor_main (void *arg)
 	{
 	  log_debug ("monitor (pimpl=0x%p): done: monitored process died\n",
 		     pimpl);
-	}	  
+	}
       else if (res == WAIT_OBJECT_0 + 1)
 	goto retry;
       else
@@ -1391,7 +1391,7 @@ assign_rvid (opnctx_t ctx, DWORD rvid, DWORD pid)
       SetLastError (ERROR_NOT_FOUND);
       return FALSE;
     }
-  
+
   if (peerctx->pipeimpl
       && peerctx->pipeimpl->monitor_proc != INVALID_HANDLE_VALUE)
     {
@@ -1479,7 +1479,7 @@ GPG_IOControl (DWORD opnctx_arg, DWORD code, void *inbuf, DWORD inbuflen,
   opnctx = verify_opnctx (opnctx_arg);
   if (!opnctx)
     {
-      log_debug ("GPG_IOControl (ctx=%i): error: could not access context\n", 
+      log_debug ("GPG_IOControl (ctx=%i): error: could not access context\n",
 		 opnctx_arg);
       goto leave;
     }
@@ -1497,13 +1497,13 @@ GPG_IOControl (DWORD opnctx_arg, DWORD code, void *inbuf, DWORD inbuflen,
       log_debug ("GPG_IOControl (ctx=%i): code: GET_RVID\n", opnctx_arg);
       if (inbuf || inbuflen || !outbuf || outbuflen < sizeof (LONG))
         {
-	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n", 
+	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n",
 		     opnctx_arg);
           SetLastError (ERROR_INVALID_PARAMETER);
           goto leave;
         }
 
-      if (! opnctx->rvid) 
+      if (! opnctx->rvid)
 	opnctx->rvid = create_rendezvous_id ();
       log_debug ("GPG_IOControl (ctx=%i): returning rvid: %08lx\n",
 		 opnctx_arg, opnctx->rvid);
@@ -1516,16 +1516,16 @@ GPG_IOControl (DWORD opnctx_arg, DWORD code, void *inbuf, DWORD inbuflen,
 
     case GPGCEDEV_IOCTL_MAKE_PIPE:
       log_debug ("GPG_IOControl (ctx=%i): code: MAKE_PIPE\n", opnctx_arg);
-      if (!inbuf || inbuflen < sizeof (LONG) 
+      if (!inbuf || inbuflen < sizeof (LONG)
           || outbuf || outbuflen || actualoutlen)
         {
-	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n", 
+	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n",
 		     opnctx_arg);
           SetLastError (ERROR_INVALID_PARAMETER);
           goto leave;
         }
       memcpy (&rvid, inbuf, sizeof (LONG));
-      log_debug ("GPG_IOControl (ctx=%i): make pipe for rvid: %08lx\n", 
+      log_debug ("GPG_IOControl (ctx=%i): make pipe for rvid: %08lx\n",
 		 opnctx_arg, rvid);
       if (make_pipe (opnctx, rvid))
         result = TRUE;
@@ -1535,12 +1535,12 @@ GPG_IOControl (DWORD opnctx_arg, DWORD code, void *inbuf, DWORD inbuflen,
       log_debug ("GPG_IOControl (ctx=%i): code: UNBLOCK\n", opnctx_arg);
       if (inbuf || inbuflen || outbuf || outbuflen || actualoutlen)
         {
-	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n", 
+	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n",
 		     opnctx_arg);
           SetLastError (ERROR_INVALID_PARAMETER);
           goto leave;
         }
-      
+
       if (unblock_call (opnctx))
         result = TRUE;
       break;
@@ -1550,14 +1550,14 @@ GPG_IOControl (DWORD opnctx_arg, DWORD code, void *inbuf, DWORD inbuflen,
       if (!inbuf || inbuflen < 2 * sizeof (DWORD)
           || outbuf || outbuflen || actualoutlen)
         {
-	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n", 
+	  log_debug ("GPG_IOControl (ctx=%i): error: invalid parameter\n",
 		     opnctx_arg);
           SetLastError (ERROR_INVALID_PARAMETER);
           goto leave;
         }
       memcpy (&rvid, inbuf, sizeof (DWORD));
       memcpy (&pid, ((char *) inbuf) + sizeof (DWORD), sizeof (DWORD));
-      log_debug ("GPG_IOControl (ctx=%i): assign rvid %08lx to pid %08lx\n", 
+      log_debug ("GPG_IOControl (ctx=%i): assign rvid %08lx to pid %08lx\n",
 		 opnctx_arg, rvid, pid);
       if (assign_rvid (opnctx, rvid, pid))
         result = TRUE;
@@ -1635,6 +1635,6 @@ DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved)
     default:
       break;
     }
-  
+
   return TRUE;
 }
diff --git a/src/gpgcedev.def b/src/gpgcedev.def
index 387e3a6..bc52d3a 100644
--- a/src/gpgcedev.def
+++ b/src/gpgcedev.def
@@ -15,6 +15,7 @@
 ;
 ; You should have received a copy of the GNU Lesser General Public
 ; License along with this program; if not, see <http://www.gnu.org/licenses/>.
+; SPDX-License-Identifier: LGPL-3.0+
 
 
 EXPORTS
diff --git a/src/gpgcemgr.c b/src/gpgcemgr.c
index 9dafbc0..5b4f56e 100644
--- a/src/gpgcemgr.c
+++ b/src/gpgcemgr.c
@@ -1,20 +1,21 @@
 /* gpgcempr.c - Manager for GPG CE devices
-   Copyright (C) 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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 3 of
-   the License, or (at your option) any later version.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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 3 of
+ * the License, or (at your option) any later version.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-3.0+
  */
 
 #define _WIN32_WCE 0x0500
@@ -47,7 +48,7 @@ wchar_to_utf8 (const wchar_t *string)
   n = WideCharToMultiByte (CP_ACP, 0, string, length, result, n, NULL, NULL);
   if (n < 0)
     abort ();
-  
+
   result[n] = 0;
   return result;
 }
@@ -67,7 +68,7 @@ utf8_to_wchar (const char *string)
   if (n < 0)
     abort ();
   nbytes = (size_t)(n+1) * sizeof(*result);
-  if (nbytes / sizeof(*result) != (n+1)) 
+  if (nbytes / sizeof(*result) != (n+1))
     abort ();
   result = malloc (nbytes);
   if (!result)
@@ -86,7 +87,7 @@ install (void)
   HKEY handle;
   DWORD disp, dw;
   int rc;
-  
+
   if ((rc=RegCreateKeyEx (HKEY_LOCAL_MACHINE, GPGCEDEV_KEY_NAME, 0, NULL, 0,
                           KEY_WRITE, NULL, &handle, &disp)))
     {
@@ -94,14 +95,14 @@ install (void)
       return 1;
     }
 
-  RegSetValueEx (handle, L"dll", 0, REG_SZ, 
+  RegSetValueEx (handle, L"dll", 0, REG_SZ,
                  (void*)GPGCEDEV_DLL_NAME, sizeof (GPGCEDEV_DLL_NAME));
   RegSetValueEx (handle, L"prefix", 0, REG_SZ,
                  (void*)GPGCEDEV_PREFIX, sizeof (GPGCEDEV_PREFIX));
 
   dw = 1;
   RegSetValueEx (handle, L"Index", 0, REG_DWORD, (void*)&dw, sizeof dw);
-  
+
   RegCloseKey (handle);
 
   fprintf (stderr, PGM": registry key 1 created\n");
@@ -113,14 +114,14 @@ install (void)
       return 1;
     }
 
-  RegSetValueEx (handle, L"dll", 0, REG_SZ, 
+  RegSetValueEx (handle, L"dll", 0, REG_SZ,
                  (void*)GPGCEDEV_DLL_NAME, sizeof (GPGCEDEV_DLL_NAME));
   RegSetValueEx (handle, L"prefix", 0, REG_SZ,
                  (void*)GPGCEDEV_PREFIX, sizeof (GPGCEDEV_PREFIX));
 
   dw = 2;
   RegSetValueEx (handle, L"Index", 0, REG_DWORD, (void*)&dw, sizeof dw);
-  
+
   RegCloseKey (handle);
 
   fprintf (stderr, PGM": registry key 2 created\n");
@@ -146,7 +147,7 @@ deinstall (wchar_t *name)
         fprintf (stderr, PGM": device not found\n");
       else
         {
-          fprintf (stderr, PGM": FindFirstDevice failed: rc=%d\n", 
+          fprintf (stderr, PGM": FindFirstDevice failed: rc=%d\n",
                    (int)GetLastError ());
           result = 1;
         }
@@ -178,15 +179,15 @@ enable_debug (int yes)
   HKEY handle;
   DWORD disp;
   int rc;
-  
+
   if ((rc=RegCreateKeyEx (HKEY_LOCAL_MACHINE, GPGCEDEV_KEY_NAME, 0, NULL, 0,
                           KEY_WRITE, NULL, &handle, &disp)))
     {
       fprintf (stderr, PGM": error creating debug registry key: rc=%d\n", rc);
       return 1;
     }
-  
-  RegSetValueEx (handle, L"debugDriver", 0, REG_SZ, 
+
+  RegSetValueEx (handle, L"debugDriver", 0, REG_SZ,
                  (void*)(yes? L"1":L"0"), sizeof L"0");
   RegCloseKey (handle);
   return 0;
@@ -199,15 +200,15 @@ enable_log (int yes)
   HKEY handle;
   DWORD disp;
   int rc;
-  
+
   if ((rc=RegCreateKeyEx (HKEY_LOCAL_MACHINE, GPGCEDEV_KEY_NAME2, 0, NULL, 0,
                           KEY_WRITE, NULL, &handle, &disp)))
     {
       fprintf (stderr, PGM": error creating debug registry key: rc=%d\n", rc);
       return 1;
     }
-  
-  RegSetValueEx (handle, L"enableLog", 0, REG_SZ, 
+
+  RegSetValueEx (handle, L"enableLog", 0, REG_SZ,
                  (void*)(yes? L"1":L"0"), sizeof L"0");
   RegCloseKey (handle);
   return 0;
@@ -266,7 +267,7 @@ load_sensor_api (void)
 }
 
 
-static int 
+static int
 gravity (void)
 {
   int rc;
@@ -391,7 +392,7 @@ set_show_registry (const wchar_t *key, const wchar_t *name, const char *value)
   HKEY handle;
   DWORD disp, nbytes, n1, type;
   int rc;
-  
+
   if ((rc=RegCreateKeyEx (HKEY_LOCAL_MACHINE, key, 0, NULL, 0,
                           KEY_WRITE, NULL, &handle, &disp)))
     {
@@ -407,7 +408,7 @@ set_show_registry (const wchar_t *key, const wchar_t *name, const char *value)
   else if (value)
     {
       wchar_t *tmp = utf8_to_wchar (value);
-      if ((rc=RegSetValueEx (handle, name, 0, REG_SZ, 
+      if ((rc=RegSetValueEx (handle, name, 0, REG_SZ,
                              (void*)tmp, wcslen (tmp)*sizeof(wchar_t))))
         fprintf (stderr, PGM": error setting registry value: rc=%d\n", rc);
       free (tmp);
@@ -418,15 +419,15 @@ set_show_registry (const wchar_t *key, const wchar_t *name, const char *value)
       if ((rc=RegQueryValueEx (handle, name, 0, NULL, NULL, &nbytes)))
         {
           if (rc == ERROR_FILE_NOT_FOUND)
-            fprintf (stderr, PGM": registry value not set\n"); 
+            fprintf (stderr, PGM": registry value not set\n");
           else
-            fprintf (stderr, PGM": error reading registry value: rc=%d\n", rc); 
+            fprintf (stderr, PGM": error reading registry value: rc=%d\n", rc);
         }
       else
         {
           char *result = malloc ((n1=nbytes+2));
           if (!result)
-            fprintf (stderr, PGM": malloc failed: rc=%d\n", 
+            fprintf (stderr, PGM": malloc failed: rc=%d\n",
                      (int)GetLastError ());
           else if ((rc=RegQueryValueEx (handle, name, 0, &type,
                                          (void*)result, &n1)))
@@ -438,7 +439,7 @@ set_show_registry (const wchar_t *key, const wchar_t *name, const char *value)
           else
             {
               result[nbytes] = 0;   /* Make sure it is a string.  */
-              result[nbytes+1] = 0; 
+              result[nbytes+1] = 0;
               if (type == REG_SZ)
                 {
                   wchar_t *tmp = (void*)result;
@@ -452,7 +453,7 @@ set_show_registry (const wchar_t *key, const wchar_t *name, const char *value)
             }
         }
     }
-  
+
   RegCloseKey (handle);
 }
 
@@ -522,7 +523,7 @@ main (int argc, char **argv)
               fprintf (stderr, PGM": device `GPG2:' seems to work\n");
               CloseHandle (hd);
             }
-          
+
         }
     }
   else if (argc > 1 && !strcmp (argv[1], "--gravity"))
@@ -549,7 +550,7 @@ main (int argc, char **argv)
           DWORD nwritten;
           int i;
 
-          for (i=0; i < 3; i++) 
+          for (i=0; i < 3; i++)
             {
               if (!WriteFile (hd, marktwain, strlen (marktwain),
                               &nwritten, NULL))
@@ -572,10 +573,10 @@ main (int argc, char **argv)
   else if (argc > 1 && !strcmp (argv[1], "--disable-log"))
     result = enable_log (0);
   else if (argc > 1 && !strcmp (argv[1], "--gpgme-log"))
-    set_show_registry (L"Software\\GNU\\gpgme", L"debug", 
-                                argc > 2? argv[2] : NULL); 
+    set_show_registry (L"Software\\GNU\\gpgme", L"debug",
+                                argc > 2? argv[2] : NULL);
   else if (argc > 1 && !strcmp (argv[1], "--gnupg-log"))
-    set_show_registry (L"Software\\GNU\\GnuPG", L"DefaultLogFile", 
+    set_show_registry (L"Software\\GNU\\GnuPG", L"DefaultLogFile",
                                 argc > 2? argv[2] : NULL);
  else
     {
diff --git a/src/isascii.c b/src/isascii.c
index 77ed970..3160390 100644
--- a/src/isascii.c
+++ b/src/isascii.c
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/libassuan-config.in b/src/libassuan-config.in
index dd25a4c..04177f0 100644
--- a/src/libassuan-config.in
+++ b/src/libassuan-config.in
@@ -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
 
 # Configure libgpg-error.
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
diff --git a/src/libassuan.def b/src/libassuan.def
index c320151..7e32a3d 100644
--- a/src/libassuan.def
+++ b/src/libassuan.def
@@ -14,8 +14,8 @@
 ; GNU 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, write to the Free Software
-; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+; License along with this program; if not, see <http://www.gnu.org/licenses/>.
+; SPDX-License-Identifier: LGPL-2.1+
 
 
 EXPORTS
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index 4b196a5..fe45b06 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -8,6 +8,7 @@ dnl
 dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl
 dnl Common code used for libassuan detection [internal]
@@ -58,7 +59,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
 
     if test "$major" -gt "$req_major"; then
         ok=yes
-    else 
+    else
         if test "$major" -eq "$req_major"; then
             if test "$minor" -gt "$req_minor"; then
                ok=yes
diff --git a/src/libassuan.vers b/src/libassuan.vers
index 37c0131..a178127 100644
--- a/src/libassuan.vers
+++ b/src/libassuan.vers
@@ -15,6 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: LGPL-2.1+
 
 #-----------------------------------------------------------
 # Please remember to add new functions also to libassuan.def
diff --git a/src/memrchr.c b/src/memrchr.c
index 258216c..adb68d7 100644
--- a/src/memrchr.c
+++ b/src/memrchr.c
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/mkheader.c b/src/mkheader.c
index 44eb78e..0ee0944 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -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
  */
 
 
diff --git a/src/posix-fd-t.inc.h b/src/posix-fd-t.inc.h
index 80aa5f0..832c4fa 100644
--- a/src/posix-fd-t.inc.h
+++ b/src/posix-fd-t.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/posix-includes.inc.h b/src/posix-includes.inc.h
index c641f86..d95a403 100644
--- a/src/posix-includes.inc.h
+++ b/src/posix-includes.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/posix-sock-nonce.inc.h b/src/posix-sock-nonce.inc.h
index a62216d..edd5a57 100644
--- a/src/posix-sock-nonce.inc.h
+++ b/src/posix-sock-nonce.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
@@ -23,7 +24,7 @@
    based on a local TCP connections.  To implement access permissions
    based on file permissions a nonce is used which is expected by the
    server as the first bytes received.  On POSIX systems this is a
-   dummy structure. */  
+   dummy structure. */
 struct assuan_sock_nonce_s
 {
   size_t length;
diff --git a/src/posix-sys-pth-impl.h b/src/posix-sys-pth-impl.h
index 77d38f0..6943359 100644
--- a/src/posix-sys-pth-impl.h
+++ b/src/posix-sys-pth-impl.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
@@ -84,5 +85,3 @@
     return ret;								\
   }                                                                     \
 ##EOF## Force end-of file.
-
-
diff --git a/src/posix-types.inc.h b/src/posix-types.inc.h
index c242b48..e3810b3 100644
--- a/src/posix-types.inc.h
+++ b/src/posix-types.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/putc_unlocked.c b/src/putc_unlocked.c
index 80b3aa1..6adcaec 100644
--- a/src/putc_unlocked.c
+++ b/src/putc_unlocked.c
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/server.c b/src/server.c
index 6cc75ae..7c82f02 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,20 +1,21 @@
 /* server.c - Interfaces for all assuan servers.
-   Copyright (C) 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/setenv.c b/src/setenv.c
index 9f91124..3410b30 100644
--- a/src/setenv.c
+++ b/src/setenv.c
@@ -1,19 +1,20 @@
 /* Copyright (C) 1992,1995-2001,2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library 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.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, 
-   see <http://www.gnu.org/licenses/>.
+ * This file is part of the GNU C Library.
+ *
+ * The GNU C Library 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.
+ *
+ * The GNU C 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the GNU C Library; if not,
+ * see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/stpcpy.c b/src/stpcpy.c
index 8c489b8..4820c7a 100644
--- a/src/stpcpy.c
+++ b/src/stpcpy.c
@@ -1,19 +1,21 @@
 /* Copyright (C) 1992, 1995, 1997, 2002, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library 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.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, 
-   see <http://www.gnu.org/licenses/>.  */
+ * This file is part of the GNU C Library.
+ *
+ * The GNU C Library 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.
+ *
+ * The GNU C 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the GNU C Library; if not,
+ * see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
+ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/src/system-posix.c b/src/system-posix.c
index d274994..b7da9e3 100644
--- a/src/system-posix.c
+++ b/src/system-posix.c
@@ -1,20 +1,21 @@
 /* system-posix.c - System support functions.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/system-w32.c b/src/system-w32.c
index 7b95d5c..9547ce0 100644
--- a/src/system-w32.c
+++ b/src/system-w32.c
@@ -1,20 +1,21 @@
 /* system-w32.c - System support functions for Windows.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/system-w32ce.c b/src/system-w32ce.c
index d3e3357..da5dcf2 100644
--- a/src/system-w32ce.c
+++ b/src/system-w32ce.c
@@ -1,20 +1,21 @@
 /* system-w32ce.c - System support functions for WindowsCE.
-   Copyright (C) 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/system.c b/src/system.c
index ddb99fb..00b76cb 100644
--- a/src/system.c
+++ b/src/system.c
@@ -1,20 +1,21 @@
 /* system.c - System support functions.
-   Copyright (C) 2009 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 
diff --git a/src/sysutils.c b/src/sysutils.c
index 0eb5d1c..74031cd 100644
--- a/src/sysutils.c
+++ b/src/sysutils.c
@@ -1,20 +1,21 @@
 /* sysutils.c - System utilities
-   Copyright (C) 2010 Free Software Foundation, Inc.
-
-   This file is part of Assuan.
-
-   Assuan 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.
-
-   Assuan 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
-   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 <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of Assuan.
+ *
+ * Assuan 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.
+ *
+ * Assuan 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,6 +48,7 @@ _assuan_sysutils_blurb (void)
     "This is Libassuan " PACKAGE_VERSION " - The GnuPG IPC Library\n"
     "Copyright 2001-2013 Free Software Foundation, Inc.\n"
     "Copyright 2001-2014 g10 Code GmbH\n"
+    "SPDX-License-Identifier: LGPL-2.1+\n"
     "\n"
     "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n"
     "\n\n";
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index 23db15e..9f0237f 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -8,6 +8,7 @@
  * This program 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
  */
 
 /* This file is processed by configure to create versioninfo.rc */
@@ -49,4 +50,3 @@ BEGIN
         END
     END
 END
-
diff --git a/src/w32-fd-t.inc.h b/src/w32-fd-t.inc.h
index 37f20f4..ca63671 100644
--- a/src/w32-fd-t.inc.h
+++ b/src/w32-fd-t.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/w32-includes.inc.h b/src/w32-includes.inc.h
index 1945692..5f4ab9f 100644
--- a/src/w32-includes.inc.h
+++ b/src/w32-includes.inc.h
@@ -15,10 +15,11 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
 ## a double hash mark are not copied to the destination file.
 #include <winsock2.h>
-#include <ws2tcpip.h> 
+#include <ws2tcpip.h>
 ##EOF##
diff --git a/src/w32-sock-nonce.inc.h b/src/w32-sock-nonce.inc.h
index 4b099ff..b620b54 100644
--- a/src/w32-sock-nonce.inc.h
+++ b/src/w32-sock-nonce.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/w32-sys-pth-impl.h b/src/w32-sys-pth-impl.h
index ebd6ec6..0150e6e 100644
--- a/src/w32-sys-pth-impl.h
+++ b/src/w32-sys-pth-impl.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/w32-types.inc.h b/src/w32-types.inc.h
index 35aaec9..6cf9ad2 100644
--- a/src/w32-types.inc.h
+++ b/src/w32-types.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/w32ce-add.h b/src/w32ce-add.h
index 5306f9a..1f7d7db 100644
--- a/src/w32ce-add.h
+++ b/src/w32ce-add.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with
diff --git a/src/w32ce-fd-t.inc.h b/src/w32ce-fd-t.inc.h
index 2de72e6..70c7997 100644
--- a/src/w32ce-fd-t.inc.h
+++ b/src/w32ce-fd-t.inc.h
@@ -15,6 +15,7 @@
 ##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: LGPL-2.1+
 ##
 ##
 ## This file is included by the mkheader tool.  Lines starting with