From 44c8a5e2b9af8909844cc002c53049311634b314 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 1 Jun 2016 11:26:40 -0400 Subject: [PATCH] Add final(?) set of copyrights. Add copyright to missing assembler files. Add copyrights to missing test/* files. Add copyrights Various source and misc files. Reviewed-by: Richard Levitte --- Configure | 2 -- apps/tsget.in | 13 +++++++---- config | 26 +++++++-------------- config.com | 6 +++++ crypto/aes/asm/aes-ia64.S | 7 ++++++ crypto/bn/asm/bn-c64xplus.asm | 7 ++++++ crypto/bn/asm/ia64.S | 7 ++++++ crypto/bn/asm/pa-risc2.s | 6 +++++ crypto/bn/asm/pa-risc2W.s | 7 ++++++ crypto/bn/asm/s390x.S | 10 ++++---- crypto/bn/asm/sparcv8.S | 10 ++++---- crypto/bn/asm/sparcv8plus.S | 10 ++++---- crypto/des/asm/des_enc.m4 | 27 ++++------------------ crypto/ia64cpuid.S | 6 +++++ crypto/md5/asm/md5-ia64.S | 10 ++++++++ crypto/s390xcpuid.S | 6 +++++ crypto/sparccpuid.S | 7 ++++++ engines/vendor_defns/hwcryptohook.h | 11 +++++++-- fuzz/helper.py | 7 ++++++ ms/applink.c | 9 ++++++++ ms/uplink.c | 9 ++++++++ ms/uplink.h | 9 ++++++++ test/danetest.in | 8 +++++++ test/evptests.txt | 9 ++++++++ test/recipes/80-test_cipherlist.t | 8 +++++++ test/smime-certs/mksmime-certs.sh | 7 ++++++ test/ssl-tests/01-simple.conf.in | 7 ++++++ test/ssl-tests/02-protocol-version.conf.in | 7 ++++++ test/ssl-tests/03-custom_verify.conf.in | 7 ++++++ tools/c_rehash.in | 6 +++++ util/openssl-format-source | 8 +++++++ 31 files changed, 216 insertions(+), 63 deletions(-) diff --git a/Configure b/Configure index 020f2a148a..e8fc933872 100755 --- a/Configure +++ b/Configure @@ -1970,8 +1970,6 @@ my %builders = ( unixmake => sub { build_Makefile(); - run_dofile("util/domd", "util/domd.in"); - chmod 0755, "util/domd"; }, ); diff --git a/apps/tsget.in b/apps/tsget.in index fe029f353a..7067111552 100644 --- a/apps/tsget.in +++ b/apps/tsget.in @@ -1,7 +1,11 @@ #!{- $config{perl} -} -# Written by Zoltan Glozik . -# Copyright (c) 2002 The OpenTSA Project. All rights reserved. -$::version = '$Id: tsget,v 1.3 2009/09/07 17:57:18 steve Exp $'; +# Copyright (c) 2002 The OpenTSA Project. All rights reserved. +# Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html use strict; use IO::Handle; @@ -42,7 +46,8 @@ sub create_curl { # Error-handling related options. $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d}; $curl->setopt(CURLOPT_FAILONERROR, 1); - $curl->setopt(CURLOPT_USERAGENT, "OpenTSA tsget.pl/" . (split / /, $::version)[2]); + $curl->setopt(CURLOPT_USERAGENT, + "OpenTSA tsget.pl/openssl-{- $config{version} -}"); # Options for POST method. $curl->setopt(CURLOPT_UPLOAD, 1); diff --git a/config b/config index dfdca4d955..2e02ae3691 100755 --- a/config +++ b/config @@ -1,25 +1,15 @@ #!/bin/sh +# Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. # +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + # OpenSSL config: determine the operating system and run ./Configure +# Derived from minarch and GuessOS from Apache. # -# "config -h" for usage information. -# -# this is a merge of minarch and GuessOS from the Apache Group. -# Originally written by Tim Hudson . - -# Original Apache Group comments on GuessOS - -# Simple OS/Platform guesser. Similar to config.guess but -# much, much smaller. Since it was developed for use with -# Apache, it follows under Apache's regular licensing -# with one specific addition: Any changes or additions -# to this script should be Emailed to the Apache -# group (apache@apache.org) in general and to -# Jim Jagielski (jim@jaguNET.com) in specific. -# -# Be as similar to the output of config.guess/config.sub -# as possible. - +# Do "config -h" for usage information. SUFFIX="" TEST="false" EXE="" diff --git a/config.com b/config.com index 4151a88a44..015de511a2 100644 --- a/config.com +++ b/config.com @@ -1,4 +1,10 @@ $ ! OpenSSL config: determine the architecture and run Configure +$ ! Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +$ ! +$ ! Licensed under the OpenSSL license (the "License"). You may not use +$ ! this file except in compliance with the License. You can obtain a +$ ! copy in the file LICENSE in the source distribution or at +$ ! https://www.openssl.org/source/license.html $ ! $ ! Very simple for the moment, it will take the following arguments: $ ! diff --git a/crypto/aes/asm/aes-ia64.S b/crypto/aes/asm/aes-ia64.S index 7f6c4c3662..ef44f7cc76 100644 --- a/crypto/aes/asm/aes-ia64.S +++ b/crypto/aes/asm/aes-ia64.S @@ -1,3 +1,10 @@ +// Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. +// +// Licensed under the OpenSSL license (the "License"). You may not use +// this file except in compliance with the License. You can obtain a copy +// in the file LICENSE in the source distribution or at +// https://www.openssl.org/source/license.html +// // ==================================================================== // Written by Andy Polyakov for the OpenSSL // project. Rights for redistribution and usage in source and binary diff --git a/crypto/bn/asm/bn-c64xplus.asm b/crypto/bn/asm/bn-c64xplus.asm index 7b72bff4ac..de6d37728f 100644 --- a/crypto/bn/asm/bn-c64xplus.asm +++ b/crypto/bn/asm/bn-c64xplus.asm @@ -1,3 +1,10 @@ +;; Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. +;; +;; Licensed under the OpenSSL license (the "License"). You may not use +;; this file except in compliance with the License. You can obtain a copy +;; in the file LICENSE in the source distribution or at +;; https://www.openssl.org/source/license.html +;; ;;==================================================================== ;; Written by Andy Polyakov for the OpenSSL ;; project. diff --git a/crypto/bn/asm/ia64.S b/crypto/bn/asm/ia64.S index 9e090ab8fd..2fdf5bbabe 100644 --- a/crypto/bn/asm/ia64.S +++ b/crypto/bn/asm/ia64.S @@ -3,6 +3,13 @@ .ident "ia64.S, Version 2.1" .ident "IA-64 ISA artwork by Andy Polyakov " +// Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. +// +// Licensed under the OpenSSL license (the "License"). You may not use +// this file except in compliance with the License. You can obtain a copy +// in the file LICENSE in the source distribution or at +// https://www.openssl.org/source/license.html + // // ==================================================================== // Written by Andy Polyakov for the OpenSSL diff --git a/crypto/bn/asm/pa-risc2.s b/crypto/bn/asm/pa-risc2.s index f3b16290eb..413eac7123 100644 --- a/crypto/bn/asm/pa-risc2.s +++ b/crypto/bn/asm/pa-risc2.s @@ -1,3 +1,9 @@ +; Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. +; +; Licensed under the OpenSSL license (the "License"). You may not use +; this file except in compliance with the License. You can obtain a copy +; in the file LICENSE in the source distribution or at +; https://www.openssl.org/source/license.html ; ; PA-RISC 2.0 implementation of bn_asm code, based on the ; 64-bit version of the code. This code is effectively the diff --git a/crypto/bn/asm/pa-risc2W.s b/crypto/bn/asm/pa-risc2W.s index a99545754d..97381172e7 100644 --- a/crypto/bn/asm/pa-risc2W.s +++ b/crypto/bn/asm/pa-risc2W.s @@ -1,3 +1,10 @@ +; Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +; +; Licensed under the OpenSSL license (the "License"). You may not use +; this file except in compliance with the License. You can obtain a copy +; in the file LICENSE in the source distribution or at +; https://www.openssl.org/source/license.html + ; ; PA-RISC 64-bit implementation of bn_asm code ; diff --git a/crypto/bn/asm/s390x.S b/crypto/bn/asm/s390x.S index f5eebe413a..292a7a9998 100755 --- a/crypto/bn/asm/s390x.S +++ b/crypto/bn/asm/s390x.S @@ -1,11 +1,11 @@ .ident "s390x.S, version 1.1" // ==================================================================== -// Written by Andy Polyakov for the OpenSSL -// project. +// Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. // -// Rights for redistribution and usage in source and binary forms are -// granted according to the OpenSSL license. Warranty of any kind is -// disclaimed. +// Licensed under the OpenSSL license (the "License"). You may not use +// this file except in compliance with the License. You can obtain a copy +// in the file LICENSE in the source distribution or at +// https://www.openssl.org/source/license.html // ==================================================================== .text diff --git a/crypto/bn/asm/sparcv8.S b/crypto/bn/asm/sparcv8.S index 88c5dc480a..9c31073b24 100644 --- a/crypto/bn/asm/sparcv8.S +++ b/crypto/bn/asm/sparcv8.S @@ -3,12 +3,12 @@ /* * ==================================================================== - * Written by Andy Polyakov for the OpenSSL - * project. + * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * - * Rights for redistribution and usage in source and binary forms are - * granted according to the OpenSSL license. Warranty of any kind is - * disclaimed. + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html * ==================================================================== */ diff --git a/crypto/bn/asm/sparcv8plus.S b/crypto/bn/asm/sparcv8plus.S index 915a4e781a..e77e67aa57 100644 --- a/crypto/bn/asm/sparcv8plus.S +++ b/crypto/bn/asm/sparcv8plus.S @@ -3,12 +3,12 @@ /* * ==================================================================== - * Written by Andy Polyakov for the OpenSSL - * project. + * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * - * Rights for redistribution and usage in source and binary forms are - * granted according to the OpenSSL license. Warranty of any kind is - * disclaimed. + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html * ==================================================================== */ diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4 index 3efe2465a7..2d794d3374 100644 --- a/crypto/des/asm/des_enc.m4 +++ b/crypto/des/asm/des_enc.m4 @@ -1,26 +1,9 @@ -! des_enc.m4 -! des_enc.S (generated from des_enc.m4) +! Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. ! -! UltraSPARC assembler version of the LibDES/SSLeay/OpenSSL des_enc.c file. -! -! Version 1.0. 32-bit version. -! -! June 8, 2000. -! -! Version 2.0. 32/64-bit, PIC-ification, blended CPU adaptation -! by Andy Polyakov. -! -! January 1, 2003. -! -! Assembler version: Copyright Svend Olaf Mikkelsen. -! -! Original C code: Copyright Eric A. Young. -! -! This code can be freely used by LibDES/SSLeay/OpenSSL users. -! -! The LibDES/SSLeay/OpenSSL copyright notices must be respected. -! -! This version can be redistributed. +! Licensed under the OpenSSL license (the "License"). You may not use +! this file except in compliance with the License. You can obtain a copy +! in the file LICENSE in the source distribution or at +! https://www.openssl.org/source/license.html ! ! To expand the m4 macros: m4 -B 8192 des_enc.m4 > des_enc.S ! diff --git a/crypto/ia64cpuid.S b/crypto/ia64cpuid.S index f942648bae..ffd6d6ca6f 100644 --- a/crypto/ia64cpuid.S +++ b/crypto/ia64cpuid.S @@ -1,3 +1,9 @@ +// Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. +// +// Licensed under the OpenSSL license (the "License"). You may not use +// this file except in compliance with the License. You can obtain a copy +// in the file LICENSE in the source distribution or at +// https://www.openssl.org/source/license.html // Works on all IA-64 platforms: Linux, HP-UX, Win64i... // On Win64i compile with ias.exe. .text diff --git a/crypto/md5/asm/md5-ia64.S b/crypto/md5/asm/md5-ia64.S index e7de08d46a..c20467b47b 100644 --- a/crypto/md5/asm/md5-ia64.S +++ b/crypto/md5/asm/md5-ia64.S @@ -1,3 +1,13 @@ +/* + * + * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Copyright (c) 2005 Hewlett-Packard Development Company, L.P. Permission is hereby granted, free of charge, to any person obtaining diff --git a/crypto/s390xcpuid.S b/crypto/s390xcpuid.S index df7b35ad70..61ef0eb2ac 100644 --- a/crypto/s390xcpuid.S +++ b/crypto/s390xcpuid.S @@ -1,4 +1,10 @@ .text +// Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved. +// +// Licensed under the OpenSSL license (the "License"). You may not use +// this file except in compliance with the License. You can obtain a copy +// in the file LICENSE in the source distribution or at +// https://www.openssl.org/source/license.html .globl OPENSSL_s390x_facilities .type OPENSSL_s390x_facilities,@function diff --git a/crypto/sparccpuid.S b/crypto/sparccpuid.S index f48d860159..4c394fa00d 100644 --- a/crypto/sparccpuid.S +++ b/crypto/sparccpuid.S @@ -1,3 +1,10 @@ +! Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. +! +! Licensed under the OpenSSL license (the "License"). You may not use +! this file except in compliance with the License. You can obtain a copy +! in the file LICENSE in the source distribution or at +! https://www.openssl.org/source/license.html + #ifdef OPENSSL_FIPSCANISTER #include #endif diff --git a/engines/vendor_defns/hwcryptohook.h b/engines/vendor_defns/hwcryptohook.h index 2bafffe9f6..c3dcd56f4f 100644 --- a/engines/vendor_defns/hwcryptohook.h +++ b/engines/vendor_defns/hwcryptohook.h @@ -1,3 +1,12 @@ +/* + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /*- * ModExp / RSA (with/without KM) plugin API * @@ -64,8 +73,6 @@ * library files; if you received the library files without a licence, * please contact nCipher. * - * - * $Id: hwcryptohook.h,v 1.1 2002/10/11 17:10:59 levitte Exp $ */ #ifndef HWCRYPTOHOOK_H diff --git a/fuzz/helper.py b/fuzz/helper.py index 75a9e12f0a..f5f9d77daa 100755 --- a/fuzz/helper.py +++ b/fuzz/helper.py @@ -1,4 +1,11 @@ #!/usr/bin/python +# +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html """Fuzzing helper, creates and uses corpus/crash directories. diff --git a/ms/applink.c b/ms/applink.c index 832872324d..238dbff35b 100644 --- a/ms/applink.c +++ b/ms/applink.c @@ -1,3 +1,12 @@ +/* + * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #define APPLINK_STDIN 1 #define APPLINK_STDOUT 2 #define APPLINK_STDERR 3 diff --git a/ms/uplink.c b/ms/uplink.c index 6a5091b570..7f7abfbe57 100644 --- a/ms/uplink.c +++ b/ms/uplink.c @@ -1,3 +1,12 @@ +/* + * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE) # define UNICODE #endif diff --git a/ms/uplink.h b/ms/uplink.h index 4881ba7d42..f6cd0380ae 100644 --- a/ms/uplink.h +++ b/ms/uplink.h @@ -1,3 +1,12 @@ +/* + * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #define APPMACROS_ONLY #include "applink.c" diff --git a/test/danetest.in b/test/danetest.in index 7db0400245..485c98657c 100644 --- a/test/danetest.in +++ b/test/danetest.in @@ -1,4 +1,12 @@ +# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# # Blank and comment lines ignored. +# # The first line in each block takes the form: # # diff --git a/test/evptests.txt b/test/evptests.txt index fb94416e60..93199b9c6a 100644 --- a/test/evptests.txt +++ b/test/evptests.txt @@ -1,3 +1,12 @@ +#!/bin/sh +# +# Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + #cipher:key:iv:plaintext:ciphertext:0/1(decrypt/encrypt) #aadcipher:key:iv:plaintext:ciphertext:aad:tag:0/1(decrypt/encrypt) #digest:::input:output diff --git a/test/recipes/80-test_cipherlist.t b/test/recipes/80-test_cipherlist.t index af9ac33733..98d537e5f3 100644 --- a/test/recipes/80-test_cipherlist.t +++ b/test/recipes/80-test_cipherlist.t @@ -1,4 +1,12 @@ #! /usr/bin/perl +# +# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + use strict; use warnings; diff --git a/test/smime-certs/mksmime-certs.sh b/test/smime-certs/mksmime-certs.sh index f01f66427c..89963ecf2c 100644 --- a/test/smime-certs/mksmime-certs.sh +++ b/test/smime-certs/mksmime-certs.sh @@ -1,4 +1,11 @@ #!/bin/sh +# Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + # Utility to recreate S/MIME certificates diff --git a/test/ssl-tests/01-simple.conf.in b/test/ssl-tests/01-simple.conf.in index a152f662f6..e3a6330bde 100644 --- a/test/ssl-tests/01-simple.conf.in +++ b/test/ssl-tests/01-simple.conf.in @@ -1,4 +1,11 @@ # -*- mode: perl; -*- +# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + ## SSL test configurations diff --git a/test/ssl-tests/02-protocol-version.conf.in b/test/ssl-tests/02-protocol-version.conf.in index 99b1dc0edf..22e1f360e9 100644 --- a/test/ssl-tests/02-protocol-version.conf.in +++ b/test/ssl-tests/02-protocol-version.conf.in @@ -1,4 +1,11 @@ # -*- mode: perl; -*- +# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + ## Test version negotiation diff --git a/test/ssl-tests/03-custom_verify.conf.in b/test/ssl-tests/03-custom_verify.conf.in index e2f9dc7277..1cd4273c7a 100644 --- a/test/ssl-tests/03-custom_verify.conf.in +++ b/test/ssl-tests/03-custom_verify.conf.in @@ -1,4 +1,11 @@ # -*- mode: perl; -*- +# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + ## SSL test configurations diff --git a/tools/c_rehash.in b/tools/c_rehash.in index dc66a9d962..a23a8f3f22 100644 --- a/tools/c_rehash.in +++ b/tools/c_rehash.in @@ -1,6 +1,12 @@ #!{- $config{perl} -} # {- join("\n# ", @autowarntext) -} +# Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html # Perl c_rehash script, scan all files in a directory # and add symbolic links to their hash values. diff --git a/util/openssl-format-source b/util/openssl-format-source index 725883601f..36ea43231c 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -1,4 +1,12 @@ #!/bin/sh +# +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + # # openssl-format-source # - format source tree according to OpenSSL coding style using indent -- 2.25.1