diff options
| author | jsing <> | 2019-08-10 16:02:24 +0000 | 
|---|---|---|
| committer | jsing <> | 2019-08-10 16:02:24 +0000 | 
| commit | d15bd3c8fe2277fce9e3a9781dc407dab95b9f3a (patch) | |
| tree | 9cafff79d9a2fa4933b443a20b7b81d561fc8904 /src/lib/libcrypto/cms/cms_lib.c | |
| parent | 4df8f2a71206786b2b61d7295a263df61028b550 (diff) | |
| download | openbsd-d15bd3c8fe2277fce9e3a9781dc407dab95b9f3a.tar.gz openbsd-d15bd3c8fe2277fce9e3a9781dc407dab95b9f3a.tar.bz2 openbsd-d15bd3c8fe2277fce9e3a9781dc407dab95b9f3a.zip | |
Restore the original per-file licenses for CMS.
These were removed in OpenSSL b1322259d93cf6b6286f9febcd468b6a9f577d91.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/cms/cms_lib.c | 54 | 
1 files changed, 49 insertions, 5 deletions
| diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c index c2cac26010..5a79f436f1 100644 --- a/src/lib/libcrypto/cms/cms_lib.c +++ b/src/lib/libcrypto/cms/cms_lib.c | |||
| @@ -1,10 +1,54 @@ | |||
| 1 | /* | 1 | /* | 
| 2 | * Copyright 2008-2016 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 | #include <openssl/asn1t.h> | 54 | #include <openssl/asn1t.h> | 
