gnutls-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-91-g6a8fd67


From: Simon Josefsson
Subject: [SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-91-g6a8fd67
Date: Wed, 27 Jan 2010 15:31:10 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=6a8fd67cf1a1ad36f7bf7ce1cb651d16678d612d

The branch, master has been updated
       via  6a8fd67cf1a1ad36f7bf7ce1cb651d16678d612d (commit)
       via  06a1d674e97d93ebe5ea8cb7b14b0b79adf873d6 (commit)
       via  9296e001ec3df5f003f1234fa0714ab612a111ba (commit)
       via  1b225b78243fff127bbe203727b47bfecf2e3c9d (commit)
       via  13b909232a1955a3e44f22a80a3048ce5b840ddb (commit)
       via  a647c8725dc3cd56e3c920dabb8f4882ac48b6d1 (commit)
       via  d8839ebbad025122572fd9d639bceb08231accc5 (commit)
       via  0ed06aae0ad84b521240026caa7c8a94bce8b6cf (commit)
       via  87e21cdc0de0fb3f7d9447c8cf54a6554c50388a (commit)
       via  f26e1c3703a378dd30114765fc5b0d0f37b02539 (commit)
       via  830a1b1cb8eadab6cca939bd4a07d209ea0e2802 (commit)
       via  d03d55606ec9aeb2628ddb60e47138ac8e55c10a (commit)
      from  1b4a57b94169827bbdd123625b6229e65f3e92dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a8fd67cf1a1ad36f7bf7ce1cb651d16678d612d
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:31:02 2010 +0100

    Fix license.

commit 06a1d674e97d93ebe5ea8cb7b14b0b79adf873d6
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:30:45 2010 +0100

    Fix license.

commit 9296e001ec3df5f003f1234fa0714ab612a111ba
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:30:32 2010 +0100

    Fix license.

commit 1b225b78243fff127bbe203727b47bfecf2e3c9d
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:30:18 2010 +0100

    Fix license.

commit 13b909232a1955a3e44f22a80a3048ce5b840ddb
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:29:40 2010 +0100

    Fix license.

commit a647c8725dc3cd56e3c920dabb8f4882ac48b6d1
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:28:51 2010 +0100

    Fix license.

commit d8839ebbad025122572fd9d639bceb08231accc5
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:28:01 2010 +0100

    Fix license.

commit 0ed06aae0ad84b521240026caa7c8a94bce8b6cf
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:27:20 2010 +0100

    Fix license.

commit 87e21cdc0de0fb3f7d9447c8cf54a6554c50388a
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:26:56 2010 +0100

    Fix license.

commit f26e1c3703a378dd30114765fc5b0d0f37b02539
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:25:44 2010 +0100

    Fix license.

commit 830a1b1cb8eadab6cca939bd4a07d209ea0e2802
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:24:40 2010 +0100

    Fix copyright/license.

commit d03d55606ec9aeb2628ddb60e47138ac8e55c10a
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:23:22 2010 +0100

    Indent and fix copyright notices.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am        |    4 +-
 README             |    4 +-
 README-alpha       |    2 +-
 src/benchmark.c    |  222 +++++++++++++++++++++++++++-------------------------
 src/certtool-cfg.c |   24 ++++---
 src/certtool.c     |   17 ++--
 src/cli.c          |    4 +-
 src/crypt.c        |   24 +++---
 src/prime.c        |   19 +++--
 src/psk.c          |   21 +++---
 src/tests.c        |   23 +++---
 src/tls_test.c     |   19 +++--
 12 files changed, 202 insertions(+), 181 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e6a4653..3e2bb4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-#               2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009, 2010  Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/README b/README
index 44fe5be..a6e0599 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 GNU TLS README -- Important introductory notes.
-Copyright (C) 2004, 2005, 2008 Simon Josefsson
-Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavrogiannopoulos
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+              2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 This is the GNUTLS library.  GNUTLS implements the TLS/SSL (Transport
diff --git a/README-alpha b/README-alpha
index 2ddaef2..390784c 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,5 +1,5 @@
 GNU TLS README-alpha -- Information for developers.             -*- outline -*-
-Copyright (C) 2009 Simon Josefsson
+Copyright (C) 2009, 2010  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 This file contains instructions for developers and advanced users that
diff --git a/src/benchmark.c b/src/benchmark.c
index 39aa637..b54a866 100644
--- a/src/benchmark.c
+++ b/src/benchmark.c
@@ -1,20 +1,23 @@
 /*
- * Copyright (C) 2009 Free Software Foundation, Inc.
+ * Copyright (C) 2009, 2010  Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Written by Nikos Mavrogiannopoulos <address@hidden>.
  */
 
 #include <config.h>
@@ -26,133 +29,142 @@
 #include <gnutls/crypto.h>
 #include <time.h>
 
-static unsigned char data[64*1024];
+static unsigned char data[64 * 1024];
 
 #define TOTAL_ITER 8*1024
 
-static void cipher_bench(int algo, int size)
+static void
+cipher_bench (int algo, int size)
 {
-int ret, i;
-gnutls_cipher_hd_t ctx;
-void* _key,*_iv;
-gnutls_datum_t key, iv;
-struct timespec start, stop;
-double secs;
-long data_size = 0;
-double dd;
-int blocksize = gnutls_cipher_get_block_size(algo);
-int keysize = gnutls_cipher_get_key_size(algo);
-
-  _key = malloc(keysize);
+  int ret, i;
+  gnutls_cipher_hd_t ctx;
+  void *_key, *_iv;
+  gnutls_datum_t key, iv;
+  struct timespec start, stop;
+  double secs;
+  long data_size = 0;
+  double dd;
+  int blocksize = gnutls_cipher_get_block_size (algo);
+  int keysize = gnutls_cipher_get_key_size (algo);
+
+  _key = malloc (keysize);
   if (_key == NULL)
     return;
-  memset(_key, 0xf0, keysize);
+  memset (_key, 0xf0, keysize);
 
-  _iv = malloc(blocksize);
+  _iv = malloc (blocksize);
   if (_iv == NULL)
     return;
-  memset(_iv, 0xf0, blocksize);
+  memset (_iv, 0xf0, blocksize);
 
   iv.data = _iv;
   iv.size = blocksize;
-  
+
   key.data = _key;
   key.size = keysize;
-  
-  gnutls_global_init();
-  
-  printf("Checking %s (%dkb payload)... ", gnutls_cipher_get_name(algo), size);
-  fflush(stdout);
-  clock_gettime(CLOCK_MONOTONIC, &start);
-
-  ret = gnutls_cipher_init( &ctx, algo, &key, &iv);
-  if (ret < 0) {
-    fprintf(stderr, "error: %s\n", gnutls_strerror(ret));
-    goto leave;
-  }
-  
-  for (i=0;i<TOTAL_ITER;i++) {
-    gnutls_cipher_encrypt(ctx, data, size*1024);
-    data_size+= size*1024;
-  }
-  
-  gnutls_cipher_deinit(ctx);
-
-  clock_gettime(CLOCK_MONOTONIC, &stop);
-
-  secs = 
(stop.tv_sec*1000+stop.tv_nsec/(1000*1000)-(start.tv_sec*1000+start.tv_nsec/(1000*1000)));
+
+  gnutls_global_init ();
+
+  printf ("Checking %s (%dkb payload)... ", gnutls_cipher_get_name (algo),
+         size);
+  fflush (stdout);
+  clock_gettime (CLOCK_MONOTONIC, &start);
+
+  ret = gnutls_cipher_init (&ctx, algo, &key, &iv);
+  if (ret < 0)
+    {
+      fprintf (stderr, "error: %s\n", gnutls_strerror (ret));
+      goto leave;
+    }
+
+  for (i = 0; i < TOTAL_ITER; i++)
+    {
+      gnutls_cipher_encrypt (ctx, data, size * 1024);
+      data_size += size * 1024;
+    }
+
+  gnutls_cipher_deinit (ctx);
+
+  clock_gettime (CLOCK_MONOTONIC, &stop);
+
+  secs =
+    (stop.tv_sec * 1000 + stop.tv_nsec / (1000 * 1000) -
+     (start.tv_sec * 1000 + start.tv_nsec / (1000 * 1000)));
   secs /= 1000;
-  dd = (((double)data_size/(double)secs))/1000;
-  printf("Encrypted %ld kb in %.2f secs: ", data_size/1000, secs);
-  printf("%.2f kbyte/sec\n", dd);
-  
+  dd = (((double) data_size / (double) secs)) / 1000;
+  printf ("Encrypted %ld kb in %.2f secs: ", data_size / 1000, secs);
+  printf ("%.2f kbyte/sec\n", dd);
+
 leave:
-  free(_key);
-  free(_iv);
+  free (_key);
+  free (_iv);
 
 }
 
-static void mac_bench(int algo, int size)
+static void
+mac_bench (int algo, int size)
 {
-int i;
-void* _key;
-struct timespec start, stop;
-double secs;
-long data_size = 0;
-double dd;
-int blocksize = gnutls_hmac_get_len(algo);
-
-  _key = malloc(blocksize);
+  int i;
+  void *_key;
+  struct timespec start, stop;
+  double secs;
+  long data_size = 0;
+  double dd;
+  int blocksize = gnutls_hmac_get_len (algo);
+
+  _key = malloc (blocksize);
   if (_key == NULL)
     return;
-  memset(_key, 0xf0, blocksize);
-
-  gnutls_global_init();
-  
-  printf("Checking %s (%dkb payload)... ", gnutls_mac_get_name(algo), size);
-  fflush(stdout);
-  clock_gettime(CLOCK_MONOTONIC, &start);
-
-  for (i=0;i<TOTAL_ITER;i++) {
-    gnutls_hmac_fast(algo, _key, blocksize, data, size*1024, _key);
-    data_size+= size*1024;
-  }
-  
-  clock_gettime(CLOCK_MONOTONIC, &stop);
-
-  secs = 
(stop.tv_sec*1000+stop.tv_nsec/(1000*1000)-(start.tv_sec*1000+start.tv_nsec/(1000*1000)));
+  memset (_key, 0xf0, blocksize);
+
+  gnutls_global_init ();
+
+  printf ("Checking %s (%dkb payload)... ", gnutls_mac_get_name (algo), size);
+  fflush (stdout);
+  clock_gettime (CLOCK_MONOTONIC, &start);
+
+  for (i = 0; i < TOTAL_ITER; i++)
+    {
+      gnutls_hmac_fast (algo, _key, blocksize, data, size * 1024, _key);
+      data_size += size * 1024;
+    }
+
+  clock_gettime (CLOCK_MONOTONIC, &stop);
+
+  secs =
+    (stop.tv_sec * 1000 + stop.tv_nsec / (1000 * 1000) -
+     (start.tv_sec * 1000 + start.tv_nsec / (1000 * 1000)));
   secs /= 1000;
-  dd = (((double)data_size/(double)secs))/1000;
-  printf("Hashed %ld kb in %.2f secs: ", data_size/1000, secs);
-  printf("%.2f kbyte/sec\n", dd);
-  
-  free(_key);
+  dd = (((double) data_size / (double) secs)) / 1000;
+  printf ("Hashed %ld kb in %.2f secs: ", data_size / 1000, secs);
+  printf ("%.2f kbyte/sec\n", dd);
 
-}
+  free (_key);
 
+}
 
-int main(void)
+int
+main (void)
 {
-  mac_bench(GNUTLS_MAC_SHA1, 4);
-  mac_bench(GNUTLS_MAC_SHA1, 8);
-  mac_bench(GNUTLS_MAC_SHA1, 16);
+  mac_bench (GNUTLS_MAC_SHA1, 4);
+  mac_bench (GNUTLS_MAC_SHA1, 8);
+  mac_bench (GNUTLS_MAC_SHA1, 16);
 
-  mac_bench(GNUTLS_MAC_SHA256, 4);
-  mac_bench(GNUTLS_MAC_SHA256, 8);
-  mac_bench(GNUTLS_MAC_SHA256, 16);
+  mac_bench (GNUTLS_MAC_SHA256, 4);
+  mac_bench (GNUTLS_MAC_SHA256, 8);
+  mac_bench (GNUTLS_MAC_SHA256, 16);
 
-  cipher_bench(GNUTLS_CIPHER_3DES_CBC, 4);
-  cipher_bench(GNUTLS_CIPHER_3DES_CBC, 8);
-  cipher_bench(GNUTLS_CIPHER_3DES_CBC, 16);
+  cipher_bench (GNUTLS_CIPHER_3DES_CBC, 4);
+  cipher_bench (GNUTLS_CIPHER_3DES_CBC, 8);
+  cipher_bench (GNUTLS_CIPHER_3DES_CBC, 16);
 
-  cipher_bench(GNUTLS_CIPHER_AES_128_CBC, 4);
-  cipher_bench(GNUTLS_CIPHER_AES_128_CBC, 8);
-  cipher_bench(GNUTLS_CIPHER_AES_128_CBC, 16);
+  cipher_bench (GNUTLS_CIPHER_AES_128_CBC, 4);
+  cipher_bench (GNUTLS_CIPHER_AES_128_CBC, 8);
+  cipher_bench (GNUTLS_CIPHER_AES_128_CBC, 16);
 
-  cipher_bench(GNUTLS_CIPHER_ARCFOUR, 4);
-  cipher_bench(GNUTLS_CIPHER_ARCFOUR, 8);
-  cipher_bench(GNUTLS_CIPHER_ARCFOUR, 16);
+  cipher_bench (GNUTLS_CIPHER_ARCFOUR, 4);
+  cipher_bench (GNUTLS_CIPHER_ARCFOUR, 8);
+  cipher_bench (GNUTLS_CIPHER_ARCFOUR, 16);
 
- 
-  return 0; 
+  return 0;
 }
diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index f4c2f35..3921f66 100644
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -1,20 +1,24 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 
Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *               
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *                               
+ *
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Written by Nikos Mavrogiannopoulos <address@hidden>.
  */
 
 #include <config.h>
diff --git a/src/certtool.c b/src/certtool.c
index 06b7371..96e2642 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1,20 +1,21 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software 
Foundation, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/cli.c b/src/cli.c
index d167f57..f6cb99f 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
Foundation, Inc.
- * Copyright (C) 2000,2001,2002,2003 Nikos Mavrogiannopoulos
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ * 2009, 2010  Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
diff --git a/src/crypt.c b/src/crypt.c
index 8985cb0..9a19d48 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -1,22 +1,22 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
- * Copyright (C) 2001,2003 Nikos Mavrogiannopoulos
- * Copyright (C) 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ * Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *               
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *                               
+ *
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/prime.c b/src/prime.c
index 02be9de..72fe0f8 100644
--- a/src/prime.c
+++ b/src/prime.c
@@ -1,21 +1,22 @@
 /*
- * Copyright (C) 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
- * Copyright (C) 2001,2002,2003 Nikos Mavrogiannopoulos
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+ * 2010  Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/psk.c b/src/psk.c
index 73f9b30..75ab745 100644
--- a/src/psk.c
+++ b/src/psk.c
@@ -1,20 +1,21 @@
 /*
- * Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *               
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *                               
+ *
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/tests.c b/src/tests.c
index e70972c..915dce2 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -1,21 +1,22 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
- * Copyright (C) 2000,2001,2002,2003 Nikos Mavrogiannopoulos
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009,
+ * 2010  Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *               
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *                               
+ *
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/tls_test.c b/src/tls_test.c
index b9aeff7..7dbe9c7 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -1,21 +1,22 @@
 /*
- * Copyright (C) 2000,2001,2002,2003,2006,2007,2008,2009 Nikos 
Mavrogiannopoulos
- * Copyright (C) 2004,2005, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ * 2009, 2010  Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * GNUTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNUTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>


hooks/post-receive
-- 
GNU gnutls




reply via email to

[Prev in Thread] Current Thread [Next in Thread]