summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2019-09-05 16:07:00 +0000
committerjsing <>2019-09-05 16:07:00 +0000
commitdef9345c6d62b970203c7bfb820682f89c0de08d (patch)
tree3d003aaf9f2ce4414bb11b75370e1b9ecd64ed33 /src
parent0455371281d5e3fdedbc727bb97cad8adabdce23 (diff)
downloadopenbsd-def9345c6d62b970203c7bfb820682f89c0de08d.tar.gz
openbsd-def9345c6d62b970203c7bfb820682f89c0de08d.tar.bz2
openbsd-def9345c6d62b970203c7bfb820682f89c0de08d.zip
Restore per-file license/copyright removed in OpenSSL commit 4f22f40507f.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ecdh/ecdh_kdf.c53
1 files changed, 48 insertions, 5 deletions
diff --git a/src/lib/libcrypto/ecdh/ecdh_kdf.c b/src/lib/libcrypto/ecdh/ecdh_kdf.c
index 00af7d4abe..3d9081244f 100644
--- a/src/lib/libcrypto/ecdh/ecdh_kdf.c
+++ b/src/lib/libcrypto/ecdh/ecdh_kdf.c
@@ -1,10 +1,53 @@
1/* 1/*
2 * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. 2 * Written by Stephen Henson for the OpenSSL project.
3 */
4/* ====================================================================
5 * Copyright (c) 2013 The OpenSSL Project. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 *
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 *
14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in
16 * the documentation and/or other materials provided with the
17 * distribution.
18 *
19 * 3. All advertising materials mentioning features or use of this
20 * software must display the following acknowledgment:
21 * "This product includes software developed by the OpenSSL Project
22 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
23 *
24 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
25 * endorse or promote products derived from this software without
26 * prior written permission. For written permission, please contact
27 * openssl-core@openssl.org.
28 *
29 * 5. Products derived from this software may not be called "OpenSSL"
30 * nor may "OpenSSL" appear in their names without prior written
31 * permission of the OpenSSL Project.
32 *
33 * 6. Redistributions of any form whatsoever must retain the following
34 * acknowledgment:
35 * "This product includes software developed by the OpenSSL Project
36 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
3 * 37 *
4 * Licensed under the OpenSSL license (the "License"). You may not use 38 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
5 * this file except in compliance with the License. You can obtain a copy 39 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
6 * in the file LICENSE in the source distribution or at 40 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
7 * https://www.openssl.org/source/license.html 41 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
42 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
43 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
44 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
45 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
46 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
47 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
48 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49 * OF THE POSSIBILITY OF SUCH DAMAGE.
50 * ====================================================================
8 */ 51 */
9 52
10#include <string.h> 53#include <string.h>