summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-12-24 07:12:09 +0000
committertb <>2022-12-24 07:12:09 +0000
commit54da696f897367a85e20e97a53d29b18b44cf8b7 (patch)
tree23bca3642ae8ee3fc374fbf62eef6c3c558b852a
parent9744fd2b8d00f348aeebba64f628d9451102285b (diff)
downloadopenbsd-54da696f897367a85e20e97a53d29b18b44cf8b7.tar.gz
openbsd-54da696f897367a85e20e97a53d29b18b44cf8b7.tar.bz2
openbsd-54da696f897367a85e20e97a53d29b18b44cf8b7.zip
Zap trailing whitespace in license and add some empty lines
-rw-r--r--src/lib/libcrypto/comp/c_rle.c6
-rw-r--r--src/lib/libcrypto/comp/c_zlib.c6
-rw-r--r--src/lib/libcrypto/comp/comp.h5
-rw-r--r--src/lib/libcrypto/comp/comp_lib.c6
-rw-r--r--src/lib/libcrypto/comp/comp_local.h5
5 files changed, 18 insertions, 10 deletions
diff --git a/src/lib/libcrypto/comp/c_rle.c b/src/lib/libcrypto/comp/c_rle.c
index 4808bb7bde..c2c279dc04 100644
--- a/src/lib/libcrypto/comp/c_rle.c
+++ b/src/lib/libcrypto/comp/c_rle.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_rle.c,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */ 1/* $OpenBSD: c_rle.c,v 1.11 2022/12/24 07:12:09 tb Exp $ */
2/* 2/*
3 * --------------------------------------------------------------------------- 3 * ---------------------------------------------------------------------------
4 * Patches to this file were contributed by 4 * Patches to this file were contributed by
@@ -11,7 +11,7 @@
11 * are met: 11 * are met:
12 * 12 *
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 15 *
16 * 2. Redistributions in binary form must reproduce the above copyright 16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in 17 * notice, this list of conditions and the following disclaimer in
@@ -111,9 +111,11 @@
111 * simply be copied and put under another distribution licence 111 * simply be copied and put under another distribution licence
112 * [including the GNU Public Licence.] 112 * [including the GNU Public Licence.]
113 */ 113 */
114
114#include <stdio.h> 115#include <stdio.h>
115#include <stdlib.h> 116#include <stdlib.h>
116#include <string.h> 117#include <string.h>
118
117#include <openssl/objects.h> 119#include <openssl/objects.h>
118#include <openssl/comp.h> 120#include <openssl/comp.h>
119 121
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c
index efcf9ba7a3..6aac97e451 100644
--- a/src/lib/libcrypto/comp/c_zlib.c
+++ b/src/lib/libcrypto/comp/c_zlib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_zlib.c,v 1.23 2022/12/23 23:23:02 schwarze Exp $ */ 1/* $OpenBSD: c_zlib.c,v 1.24 2022/12/24 07:12:09 tb Exp $ */
2/* 2/*
3 * --------------------------------------------------------------------------- 3 * ---------------------------------------------------------------------------
4 * Major patches to this file were contributed by 4 * Major patches to this file were contributed by
@@ -13,7 +13,7 @@
13 * are met: 13 * are met:
14 * 14 *
15 * 1. Redistributions of source code must retain the above copyright 15 * 1. Redistributions of source code must retain the above copyright
16 * notice, this list of conditions and the following disclaimer. 16 * notice, this list of conditions and the following disclaimer.
17 * 17 *
18 * 2. Redistributions in binary form must reproduce the above copyright 18 * 2. Redistributions in binary form must reproduce the above copyright
19 * notice, this list of conditions and the following disclaimer in 19 * notice, this list of conditions and the following disclaimer in
@@ -113,9 +113,11 @@
113 * simply be copied and put under another distribution licence 113 * simply be copied and put under another distribution licence
114 * [including the GNU Public Licence.] 114 * [including the GNU Public Licence.]
115 */ 115 */
116
116#include <stdio.h> 117#include <stdio.h>
117#include <stdlib.h> 118#include <stdlib.h>
118#include <string.h> 119#include <string.h>
120
119#include <openssl/objects.h> 121#include <openssl/objects.h>
120#include <openssl/comp.h> 122#include <openssl/comp.h>
121#include <openssl/err.h> 123#include <openssl/err.h>
diff --git a/src/lib/libcrypto/comp/comp.h b/src/lib/libcrypto/comp/comp.h
index de1aaa3c71..58b51c6e82 100644
--- a/src/lib/libcrypto/comp/comp.h
+++ b/src/lib/libcrypto/comp/comp.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: comp.h,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */ 1/* $OpenBSD: comp.h,v 1.11 2022/12/24 07:12:09 tb Exp $ */
2/* 2/*
3 * --------------------------------------------------------------------------- 3 * ---------------------------------------------------------------------------
4 * Patches to this file were contributed by 4 * Patches to this file were contributed by
@@ -11,7 +11,7 @@
11 * are met: 11 * are met:
12 * 12 *
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 15 *
16 * 2. Redistributions in binary form must reproduce the above copyright 16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in 17 * notice, this list of conditions and the following disclaimer in
@@ -111,6 +111,7 @@
111 * simply be copied and put under another distribution licence 111 * simply be copied and put under another distribution licence
112 * [including the GNU Public Licence.] 112 * [including the GNU Public Licence.]
113 */ 113 */
114
114#ifndef HEADER_COMP_H 115#ifndef HEADER_COMP_H
115#define HEADER_COMP_H 116#define HEADER_COMP_H
116 117
diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c
index a8a038e515..5cb2335bf5 100644
--- a/src/lib/libcrypto/comp/comp_lib.c
+++ b/src/lib/libcrypto/comp/comp_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: comp_lib.c,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */ 1/* $OpenBSD: comp_lib.c,v 1.11 2022/12/24 07:12:09 tb Exp $ */
2/* 2/*
3 * --------------------------------------------------------------------------- 3 * ---------------------------------------------------------------------------
4 * Patches to this file were contributed by 4 * Patches to this file were contributed by
@@ -11,7 +11,7 @@
11 * are met: 11 * are met:
12 * 12 *
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 15 *
16 * 2. Redistributions in binary form must reproduce the above copyright 16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in 17 * notice, this list of conditions and the following disclaimer in
@@ -111,9 +111,11 @@
111 * simply be copied and put under another distribution licence 111 * simply be copied and put under another distribution licence
112 * [including the GNU Public Licence.] 112 * [including the GNU Public Licence.]
113 */ 113 */
114
114#include <stdio.h> 115#include <stdio.h>
115#include <stdlib.h> 116#include <stdlib.h>
116#include <string.h> 117#include <string.h>
118
117#include <openssl/objects.h> 119#include <openssl/objects.h>
118#include <openssl/comp.h> 120#include <openssl/comp.h>
119 121
diff --git a/src/lib/libcrypto/comp/comp_local.h b/src/lib/libcrypto/comp/comp_local.h
index 5841756e73..e26a800ba3 100644
--- a/src/lib/libcrypto/comp/comp_local.h
+++ b/src/lib/libcrypto/comp/comp_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: comp_local.h,v 1.3 2022/12/23 23:23:02 schwarze Exp $ */ 1/* $OpenBSD: comp_local.h,v 1.4 2022/12/24 07:12:09 tb Exp $ */
2/* 2/*
3 * --------------------------------------------------------------------------- 3 * ---------------------------------------------------------------------------
4 * Patches to this file were contributed by 4 * Patches to this file were contributed by
@@ -11,7 +11,7 @@
11 * are met: 11 * are met:
12 * 12 *
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 15 *
16 * 2. Redistributions in binary form must reproduce the above copyright 16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in 17 * notice, this list of conditions and the following disclaimer in
@@ -111,6 +111,7 @@
111 * simply be copied and put under another distribution licence 111 * simply be copied and put under another distribution licence
112 * [including the GNU Public Licence.] 112 * [including the GNU Public Licence.]
113 */ 113 */
114
114#ifndef HEADER_COMP_LOCAL_H 115#ifndef HEADER_COMP_LOCAL_H
115#define HEADER_COMP_LOCAL_H 116#define HEADER_COMP_LOCAL_H
116 117