summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-05-17 14:24:46 -0400
committerRich Salz <rsalz@openssl.org>2016-05-17 14:24:46 -0400
commit6286757141a8c6e14d647ec733634ae0c83d9887 (patch)
treeaba03d4f3fbf3c8db7ccf04e88c72d8c0aadc377 /crypto
parent21dcbebc6e35419f1842f39a125374ea1ba45693 (diff)
Copyright consolidation 04/10
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/async/arch/async_null.c53
-rw-r--r--crypto/async/arch/async_null.h53
-rw-r--r--crypto/async/arch/async_posix.c53
-rw-r--r--crypto/async/arch/async_posix.h54
-rw-r--r--crypto/async/arch/async_win.c53
-rw-r--r--crypto/async/arch/async_win.h53
-rw-r--r--crypto/async/async.c53
-rw-r--r--crypto/async/async_locl.h53
-rw-r--r--crypto/async/async_wait.c53
-rw-r--r--crypto/comp/c_zlib.c57
-rw-r--r--crypto/comp/comp_lcl.h57
-rw-r--r--crypto/comp/comp_lib.c57
-rw-r--r--crypto/conf/conf_api.c60
-rw-r--r--crypto/conf/conf_def.c60
-rw-r--r--crypto/conf/conf_lib.c59
-rw-r--r--crypto/conf/conf_mall.c59
-rw-r--r--crypto/conf/conf_mod.c59
-rw-r--r--crypto/conf/conf_sap.c59
-rw-r--r--crypto/evp/bio_b64.c60
-rw-r--r--crypto/evp/bio_enc.c60
-rw-r--r--crypto/evp/bio_md.c60
-rw-r--r--crypto/evp/c_allc.c60
-rw-r--r--crypto/evp/digest.c113
-rw-r--r--crypto/evp/e_bf.c60
-rw-r--r--crypto/evp/e_camellia.c57
-rw-r--r--crypto/evp/e_cast.c60
-rw-r--r--crypto/evp/e_chacha20_poly1305.c53
-rw-r--r--crypto/evp/e_des3.c60
-rw-r--r--crypto/evp/e_idea.c60
-rw-r--r--crypto/evp/e_null.c60
-rw-r--r--crypto/evp/e_old.c59
-rw-r--r--crypto/evp/e_rc2.c60
-rw-r--r--crypto/evp/e_rc4_hmac_md5.c52
-rw-r--r--crypto/evp/e_rc5.c60
-rw-r--r--crypto/evp/e_seed.c57
-rw-r--r--crypto/evp/e_xcbc_d.c60
-rw-r--r--crypto/evp/encode.c60
-rw-r--r--crypto/evp/evp_cnf.c59
-rw-r--r--crypto/evp/evp_enc.c60
-rw-r--r--crypto/evp/evp_key.c60
-rw-r--r--crypto/evp/evp_lib.c60
-rw-r--r--crypto/evp/evp_pbe.c59
-rw-r--r--crypto/evp/m_md4.c60
-rw-r--r--crypto/evp/m_md5_sha1.c54
-rw-r--r--crypto/evp/m_mdc2.c60
-rw-r--r--crypto/evp/m_ripemd.c60
-rw-r--r--crypto/evp/m_sha1.c60
-rw-r--r--crypto/evp/m_sigver.c59
-rw-r--r--crypto/evp/names.c60
-rw-r--r--crypto/evp/p5_crpt.c59
-rw-r--r--crypto/evp/p5_crpt2.c60
-rw-r--r--crypto/evp/p_dec.c60
-rw-r--r--crypto/evp/p_enc.c60
-rw-r--r--crypto/evp/p_lib.c60
-rw-r--r--crypto/evp/p_sign.c60
-rw-r--r--crypto/evp/p_verify.c60
-rw-r--r--crypto/evp/pmeth_gn.c59
-rw-r--r--crypto/evp/pmeth_lib.c59
-rw-r--r--crypto/evp/scrypt.c59
-rw-r--r--crypto/fips_ers.c9
-rw-r--r--crypto/o_fips.c59
-rw-r--r--crypto/o_str.c59
-rw-r--r--crypto/objects/o_names.c9
-rw-r--r--crypto/objects/obj_dat.c60
-rw-r--r--crypto/objects/obj_lcl.h9
-rw-r--r--crypto/objects/obj_lib.c60
-rw-r--r--crypto/objects/obj_xref.c59
-rw-r--r--crypto/objects/obj_xref.h9
-rw-r--r--crypto/pem/pem_all.c113
-rw-r--r--crypto/pem/pem_info.c60
-rw-r--r--crypto/pem/pem_lib.c60
-rw-r--r--crypto/pem/pem_oth.c60
-rw-r--r--crypto/pem/pem_pk8.c60
-rw-r--r--crypto/pem/pem_pkey.c60
-rw-r--r--crypto/pem/pem_sign.c60
-rw-r--r--crypto/pem/pem_x509.c59
-rw-r--r--crypto/pem/pem_xaux.c59
-rw-r--r--crypto/pem/pvkfmt.c59
-rw-r--r--crypto/pkcs7/bio_pk7.c55
-rw-r--r--crypto/pkcs7/pk7_asn1.c59
-rw-r--r--crypto/pkcs7/pk7_attr.c59
-rw-r--r--crypto/pkcs7/pk7_dgst.c60
-rw-r--r--crypto/pkcs7/pk7_doit.c60
-rw-r--r--crypto/pkcs7/pk7_enc.c60
-rw-r--r--crypto/pkcs7/pk7_lib.c60
-rw-r--r--crypto/pkcs7/pk7_mime.c55
-rw-r--r--crypto/pkcs7/pk7_smime.c59
-rw-r--r--crypto/pkcs7/pkcs7err.c57
-rw-r--r--crypto/rc4/rc4_enc.c60
-rw-r--r--crypto/rc4/rc4_locl.h9
-rw-r--r--crypto/rc4/rc4_skey.c60
-rw-r--r--crypto/threads_none.c52
92 files changed, 534 insertions, 4697 deletions
diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c
index 19fb72c2c0..a9ae35de45 100644
--- a/crypto/async/arch/async_null.c
+++ b/crypto/async/arch/async_null.c
@@ -1,53 +1,10 @@
/*
- * Written by Matt Caswell (matt@openssl.org) for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
*
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
+ * 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
*/
/* This must be the first #include file */
diff --git a/crypto/async/arch/async_null.h b/crypto/async/arch/async_null.h
index a965bdbbd8..aef40b5d9e 100644
--- a/crypto/async/arch/async_null.h
+++ b/crypto/async/arch/async_null.h
@@ -1,53 +1,10 @@
/*
- * Written by Matt Caswell (matt@openssl.org) for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
*
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
+ * 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
*/
#include <openssl/async.h>
diff --git a/crypto/async/arch/async_posix.c b/crypto/async/arch/async_posix.c
index 33f2a3fa1e..02c342d3df 100644
--- a/crypto/async/arch/async_posix.c
+++ b/crypto/async/arch/async_posix.c
@@ -1,53 +1,10 @@
/*
- * Written by Matt Caswell (matt@openssl.org) for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
*
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
+ * 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
*/
/* This must be the first #include file */
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index 1a611bab3c..e0099c31c4 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -1,54 +1,12 @@
/*
- * Written by Matt Caswell (matt@openssl.org) for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
*
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
+ * 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