diff options
author | jsing <> | 2019-08-10 16:20:45 +0000 |
---|---|---|
committer | jsing <> | 2019-08-10 16:20:45 +0000 |
commit | 9bf27ac1f4c4ba0abe1a348cc0c064c54354e758 (patch) | |
tree | b7f60092f8bf2c20d0e4b9d799d8a91f8a97f618 | |
parent | bf1c2858848aeada525aa7acdcf7778ccb01ad83 (diff) | |
download | openbsd-9bf27ac1f4c4ba0abe1a348cc0c064c54354e758.tar.gz openbsd-9bf27ac1f4c4ba0abe1a348cc0c064c54354e758.tar.bz2 openbsd-9bf27ac1f4c4ba0abe1a348cc0c064c54354e758.zip |
Restore the per-file license for cms.h.
This reverts the removal from OpenSSL
21dcbebc6e35419f1842f39a125374ea1ba45693.
-rw-r--r-- | src/lib/libcrypto/cms/cms.h | 54 |
1 files changed, 49 insertions, 5 deletions
diff --git a/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h index 2a35ac929d..7904177e18 100644 --- a/src/lib/libcrypto/cms/cms.h +++ b/src/lib/libcrypto/cms/cms.h | |||
@@ -1,10 +1,54 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. | 2 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
3 | * | 38 | * |
4 | * Licensed under the OpenSSL license (the "License"). You may not use | 39 | * 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 | 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
6 | * in the file LICENSE in the source distribution or at | 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
7 | * https://www.openssl.org/source/license.html | 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR |
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
8 | */ | 52 | */ |
9 | 53 | ||
10 | #ifndef HEADER_CMS_H | 54 | #ifndef HEADER_CMS_H |