Merge Fabio and Nikos copyrights to the FSF, both have signed papers.

diff --git a/doc/libtasn1.texi b/doc/libtasn1.texi
index fe693e2..eb8b7f6 100644 (file)
--- a/doc/libtasn1.texi
+++ b/doc/libtasn1.texi
@@ -15,9 +15,7 @@ This manual is for GNU Libtasn1
 which is a library for Abstract Syntax Notation One (ASN.1) and
 Distinguish Encoding Rules (DER) manipulation.
 
-Copyright @copyright{} 2004, 2006, 2007, 2008, 2009, 2010 Free Software
-Foundation, Inc.
-Copyright @copyright{} 2001, 2002, 2003  Fabio Fiorina
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/examples/CertificateExample.c b/examples/CertificateExample.c
index 0932a70..396b8cf 100644 (file)
--- a/examples/CertificateExample.c
+++ b/examples/CertificateExample.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2000,2001 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/examples/CrlExample.c b/examples/CrlExample.c
index 4bb33c4..75a7416 100644 (file)
--- a/examples/CrlExample.c
+++ b/examples/CrlExample.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2000,2001 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/coding.c b/lib/coding.c
index 6b8212d..11df3fc 100644 (file)
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002  Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/decoding.c b/lib/decoding.c
index d7f800f..da64510 100644 (file)
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/element.c b/lib/element.c
index b8f1fa7..09a6a9f 100644 (file)
--- a/lib/element.c
+++ b/lib/element.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2000, 2001, 2002, 2003 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010
+ * Free Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/errors.c b/lib/errors.c
index 77434c8..56d5f08 100644 (file)
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
- * Copyright (C) 2002, 2005 Fabio Fiorina
+ * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/gstr.c b/lib/gstr.c
index e08de14..b3f6af2 100644 (file)
--- a/lib/gstr.c
+++ b/lib/gstr.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Nikos Mavroyanopoulos
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/int.h b/lib/int.h
index bc583c4..def4927 100644 (file)
--- a/lib/int.h
+++ b/lib/int.h
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index f04aee4..ba80671 100644 (file)
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index 6057813..5ee2dee 100644 (file)
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2000,2001 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/lib/structure.c b/lib/structure.c
index c54a1cf..edaafe6 100644 (file)
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2002  Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/src/asn1Coding.c b/src/asn1Coding.c
index 18a49d4..a3aeed9 100644 (file)
--- a/src/asn1Coding.c
+++ b/src/asn1Coding.c
@@ -1,7 +1,6 @@
 /* asn1Coding.c --- program to generate a DER coding of an ASN1 definition.
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
index 51ee745..6670ba3 100644 (file)
--- a/src/asn1Decoding.c
+++ b/src/asn1Decoding.c
@@ -1,7 +1,6 @@
 /* asn1Decoding.c ---  program to generate an ASN1 type from a DER coding.
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/src/asn1Parser.c b/src/asn1Parser.c
index 7e0ead5..b7b53c7 100644 (file)
--- a/src/asn1Parser.c
+++ b/src/asn1Parser.c
@@ -1,7 +1,6 @@
 /* asn1Parser.c -- program to parse a file with ASN1 definitions
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/tests/Test_encoding.c b/tests/Test_encoding.c
index 898f189..12f89c6 100644 (file)
--- a/tests/Test_encoding.c
+++ b/tests/Test_encoding.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/tests/Test_indefinite.c b/tests/Test_indefinite.c
index a28327f..d51585e 100644 (file)
--- a/tests/Test_indefinite.c
+++ b/tests/Test_indefinite.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/tests/Test_parser.c b/tests/Test_parser.c
index 06c3f1a..3cbcf19 100644 (file)
--- a/tests/Test_parser.c
+++ b/tests/Test_parser.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *

diff --git a/tests/Test_tree.c b/tests/Test_tree.c
index 6b27495..3fc2a78 100644 (file)
--- a/tests/Test_tree.c
+++ b/tests/Test_tree.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *