[Cryptech-Commits] [sw/libhal] 01/01: Merge Paul's copyright updates.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch rpc
in repository sw/libhal.

commit d7b3463029109f515a063e771c134e7e724cc0aa
Merge: c60b4bb c82c39c
Author: Rob Austein <sra at hactrn.net>
Date:   Sun Dec 13 19:23:13 2015 -0500

    Merge Paul's copyright updates.

 GNUmakefile               | 46 ++++++++++++++++++++++++----------------------
 aes_keywrap.c             | 46 ++++++++++++++++++++++++----------------------
 asn1.c                    | 46 ++++++++++++++++++++++++----------------------
 asn1_internal.h           | 46 ++++++++++++++++++++++++----------------------
 configure.ac              | 46 ++++++++++++++++++++++++----------------------
 csprng.c                  | 46 ++++++++++++++++++++++++----------------------
 ecdsa.c                   | 46 ++++++++++++++++++++++++----------------------
 ecdsa_curves.h            | 46 ++++++++++++++++++++++++----------------------
 errorstrings.c            | 46 ++++++++++++++++++++++++----------------------
 hash.c                    | 46 ++++++++++++++++++++++++----------------------
 modexp.c                  | 46 ++++++++++++++++++++++++----------------------
 pbkdf2.c                  | 46 ++++++++++++++++++++++++----------------------
 rsa.c                     | 46 ++++++++++++++++++++++++----------------------
 tests/GNUmakefile         | 46 ++++++++++++++++++++++++----------------------
 tests/test-aes-key-wrap.c | 46 ++++++++++++++++++++++++----------------------
 tests/test-ecdsa.c        | 46 ++++++++++++++++++++++++----------------------
 tests/test-hash.c         | 46 ++++++++++++++++++++++++----------------------
 tests/test-pbkdf2.c       | 46 ++++++++++++++++++++++++----------------------
 tests/test-rsa.c          | 46 ++++++++++++++++++++++++----------------------
 tests/test-rsa.py         | 46 ++++++++++++++++++++++++----------------------
 utils/GNUmakefile         | 46 ++++++++++++++++++++++++----------------------
 utils/eim_peek_poke.c     | 46 ++++++++++++++++++++++++----------------------
 22 files changed, 528 insertions(+), 484 deletions(-)

diff --cc GNUmakefile
index 1f6b711,769d11f..8fc0d14
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -1,35 -1,32 +1,37 @@@
- # Copyright (c) 2015, SUNET
+ # Copyright (c) 2015, NORDUnet A/S
+ # All rights reserved.
  #
- # Redistribution and use in source and binary forms, with or
- # without modification, are permitted provided that the following
- # conditions are met:
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are
+ # met:
+ # - Redistributions of source code must retain the above copyright notice,
+ #   this list of conditions and the following disclaimer.
  #
- # 1. Redistributions of source code must retain the above copyright
- #    notice, this list of conditions and the following disclaimer.
+ # - Redistributions in binary form must reproduce the above copyright
+ #   notice, this list of conditions and the following disclaimer in the
+ #   documentation and/or other materials provided with the distribution.
  #
- # 2. Redistributions in binary form must reproduce the above copyright
- #    notice, this list of conditions and the following disclaimer in
- #    the documentation and/or other materials provided with the
- #    distribution.
+ # - Neither the name of the NORDUnet nor the names of its contributors may
+ #   be used to endorse or promote products derived from this software
+ #   without specific prior written permission.
  #
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ # IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ # PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ # HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ # TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
 +# Number of static hash and HMAC state blocks to allocate
 +
 +STATIC_HASH_STATE_BLOCKS = 10
 +STATIC_HMAC_STATE_BLOCKS = 4
 +
  INC		= hal.h
  LIB		= libhal.a
  OBJ		= ${IO_OBJ} core.o csprng.o hash.o aes_keywrap.o pbkdf2.o \