mirror of
https://abf.rosa.ru/djam/libressl.git
synced 2025-02-23 08:02:54 +00:00
47 lines
2.2 KiB
Diff
47 lines
2.2 KiB
Diff
|
From 45c46ae34710091d5dab6d2f1beaf438ab3fbfac Mon Sep 17 00:00:00 2001
|
||
|
|
From: schwarze <>
|
||
|
|
Date: Fri, 12 Jun 2020 18:16:13 +0000
|
||
|
|
Subject: [PATCH 22/87] add my Copyright and license, which i forgot when
|
||
|
|
adding a significant amount of text, the ERRORS section, in the previous
|
||
|
|
commit
|
||
|
|
|
||
|
|
---
|
||
|
|
src/lib/libcrypto/man/PEM_bytes_read_bio.3 | 23 +++++++++++++++++++---
|
||
|
|
1 file changed, 20 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/lib/libcrypto/man/PEM_bytes_read_bio.3 b/src/lib/libcrypto/man/PEM_bytes_read_bio.3
|
||
|
|
index 63b8a58d9..d3a664ba7 100644
|
||
|
|
--- a/src/lib/libcrypto/man/PEM_bytes_read_bio.3
|
||
|
|
+++ b/src/lib/libcrypto/man/PEM_bytes_read_bio.3
|
||
|
|
@@ -1,7 +1,24 @@
|
||
|
|
-.\" $OpenBSD: PEM_bytes_read_bio.3,v 1.3 2020/06/12 11:37:42 schwarze Exp $
|
||
|
|
-.\" OpenSSL PEM_bytes_read_bio.pod 7671342e Feb 29 15:47:12 2016 -0600
|
||
|
|
+.\" $OpenBSD: PEM_bytes_read_bio.3,v 1.4 2020/06/12 18:16:13 schwarze Exp $
|
||
|
|
+.\" selective merge up to:
|
||
|
|
+.\" OpenSSL PEM_bytes_read_bio.pod 7671342e Feb 29 15:47:12 2016 -0600
|
||
|
|
.\"
|
||
|
|
-.\" This file was written by Benjamin Kaduk <bkaduk at akamai dot com>.
|
||
|
|
+.\" This file is a derived work.
|
||
|
|
+.\" The changes are covered by the following Copyright and license:
|
||
|
|
+.\" Copyright (c) 2020 Ingo Schwarze <schwarze@openbsd.org>
|
||
|
|
+.\"
|
||
|
|
+.\" Permission to use, copy, modify, and distribute this software for any
|
||
|
|
+.\" purpose with or without fee is hereby granted, provided that the above
|
||
|
|
+.\" copyright notice and this permission notice appear in all copies.
|
||
|
|
+.\"
|
||
|
|
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||
|
|
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||
|
|
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||
|
|
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||
|
|
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||
|
|
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||
|
|
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||
|
|
+.\"
|
||
|
|
+.\" The original file was written by Benjamin Kaduk <bkaduk at akamai dot com>.
|
||
|
|
.\" Copyright (c) 2017 The OpenSSL Project. All rights reserved.
|
||
|
|
.\"
|
||
|
|
.\" Redistribution and use in source and binary forms, with or without
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|