summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/buffer
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2023-04-23 13:43:47 +0000
committercvs2svn <admin@example.com>2023-04-23 13:43:47 +0000
commite2496982472bdf233be95c5ea72d1c4dc6c91db3 (patch)
tree316488e5daf86864d8466bce0e5b000d85768378 /src/lib/libcrypto/buffer
parent097d0cf840b9007212bcd2516ed5e18939e6da3d (diff)
downloadopenbsd-tb_20230422.tar.gz
openbsd-tb_20230422.tar.bz2
openbsd-tb_20230422.zip
This commit was manufactured by cvs2git to create tag 'tb_20230422'.tb_20230422
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/buffer/buf_err.c88
-rw-r--r--src/lib/libcrypto/buffer/buf_str.c79
-rw-r--r--src/lib/libcrypto/buffer/buffer.c151
-rw-r--r--src/lib/libcrypto/buffer/buffer.h118
4 files changed, 0 insertions, 436 deletions
diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c
deleted file mode 100644
index 4dc1dca790..0000000000
--- a/src/lib/libcrypto/buffer/buf_err.c
+++ /dev/null
@@ -1,88 +0,0 @@
1/* $OpenBSD: buf_err.c,v 1.12 2022/07/12 14:42:48 kn Exp $ */
2/* ====================================================================
3 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in
14 * the documentation and/or other materials provided with the
15 * distribution.
16 *
17 * 3. All advertising materials mentioning features or use of this
18 * software must display the following acknowledgment:
19 * "This product includes software developed by the OpenSSL Project
20 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
21 *
22 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
23 * endorse or promote products derived from this software without
24 * prior written permission. For written permission, please contact
25 * openssl-core@OpenSSL.org.
26 *
27 * 5. Products derived from this software may not be called "OpenSSL"
28 * nor may "OpenSSL" appear in their names without prior written
29 * permission of the OpenSSL Project.
30 *
31 * 6. Redistributions of any form whatsoever must retain the following
32 * acknowledgment:
33 * "This product includes software developed by the OpenSSL Project
34 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
35 *
36 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
37 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
39 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
40 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
42 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
46 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
47 * OF THE POSSIBILITY OF SUCH DAMAGE.
48 * ====================================================================
49 *
50 * This product includes cryptographic software written by Eric Young
51 * (eay@cryptsoft.com). This product includes software written by Tim
52 * Hudson (tjh@cryptsoft.com).
53 *
54 */
55
56#include <stdio.h>
57
58#include <openssl/opensslconf.h>
59
60#include <openssl/err.h>
61#include <openssl/buffer.h>
62
63#ifndef OPENSSL_NO_ERR
64
65#define ERR_FUNC(func) ERR_PACK(ERR_LIB_BUF,func,0)
66#define ERR_REASON(reason) ERR_PACK(ERR_LIB_BUF,0,reason)
67
68static ERR_STRING_DATA BUF_str_functs[] = {
69 {ERR_FUNC(0xfff), "CRYPTO_internal"},
70 {0, NULL}
71};
72
73static ERR_STRING_DATA BUF_str_reasons[] = {
74 {0, NULL}
75};
76
77#endif
78
79void
80ERR_load_BUF_strings(void)
81{
82#ifndef OPENSSL_NO_ERR
83 if (ERR_func_error_string(BUF_str_functs[0].error) == NULL) {
84 ERR_load_strings(0, BUF_str_functs);
85 ERR_load_strings(0, BUF_str_reasons);
86 }
87#endif
88}
diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c
deleted file mode 100644
index 4ebc4717c8..0000000000
--- a/src/lib/libcrypto/buffer/buf_str.c
+++ /dev/null
@@ -1,79 +0,0 @@
1/* $OpenBSD: buf_str.c,v 1.11 2017/04/09 14:33:21 jsing Exp $ */
2/*
3 * Copyright (c) 2014 Bob Beck
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#include <stdlib.h>
19#include <stdio.h>
20#include <string.h>
21
22#include <openssl/buffer.h>
23#include <openssl/err.h>
24
25/*
26 * XXX these functions accept a NULL arg and return NULL
27 * when the standard ones do not. we should at an appropriate
28 * time change these to find the bad callers
29 */
30
31char *
32BUF_strdup(const char *str)
33{
34 char *ret = NULL;
35
36 if (str != NULL) {
37 if ((ret = strdup(str)) == NULL)
38 BUFerror(ERR_R_MALLOC_FAILURE);
39 }
40 return ret;
41}
42
43char *
44BUF_strndup(const char *str, size_t siz)
45{
46 char *ret = NULL;
47
48 if (str != NULL) {
49 if ((ret = strndup(str, siz)) == NULL)
50 BUFerror(ERR_R_MALLOC_FAILURE);
51 }
52 return ret;
53}
54
55void *
56BUF_memdup(const void *data, size_t siz)
57{
58 void *ret = NULL;
59
60 if (data != NULL) {
61 if ((ret = malloc(siz)) == NULL)
62 BUFerror(ERR_R_MALLOC_FAILURE);
63 else
64 (void) memcpy(ret, data, siz);
65 }
66 return ret;
67}
68
69size_t
70BUF_strlcpy(char *dst, const char *src, size_t size)
71{
72 return strlcpy(dst, src, size);
73}
74
75size_t
76BUF_strlcat(char *dst, const char *src, size_t size)
77{
78 return strlcat(dst, src, size);
79}
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
deleted file mode 100644
index f4e84c4478..0000000000
--- a/src/lib/libcrypto/buffer/buffer.c
+++ /dev/null
@@ -1,151 +0,0 @@
1/* $OpenBSD: buffer.c,v 1.27 2017/05/02 03:59:44 deraadt Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60#include <stdlib.h>
61#include <string.h>
62
63#include <openssl/buffer.h>
64#include <openssl/err.h>
65
66/*
67 * LIMIT_BEFORE_EXPANSION is the maximum n such that (n + 3) / 3 * 4 < 2**31.
68 * That function is applied in several functions in this file and this limit
69 * ensures that the result fits in an int.
70 */
71#define LIMIT_BEFORE_EXPANSION 0x5ffffffc
72
73BUF_MEM *
74BUF_MEM_new(void)
75{
76 BUF_MEM *ret;
77
78 if ((ret = calloc(1, sizeof(BUF_MEM))) == NULL) {
79 BUFerror(ERR_R_MALLOC_FAILURE);
80 return (NULL);
81 }
82
83 return (ret);
84}
85
86void
87BUF_MEM_free(BUF_MEM *a)
88{
89 if (a == NULL)
90 return;
91
92 freezero(a->data, a->max);
93 free(a);
94}
95
96int
97BUF_MEM_grow(BUF_MEM *str, size_t len)
98{
99 return BUF_MEM_grow_clean(str, len);
100}
101
102int
103BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
104{
105 char *ret;
106 size_t n;
107
108 if (str->max >= len) {
109 if (str->length >= len)
110 memset(&str->data[len], 0, str->length - len);
111 str->length = len;
112 return (len);
113 }
114
115 if (len > LIMIT_BEFORE_EXPANSION) {
116 BUFerror(ERR_R_MALLOC_FAILURE);
117 return 0;
118 }
119
120 n = (len + 3) / 3 * 4;
121 if ((ret = recallocarray(str->data, str->max, n, 1)) == NULL) {
122 BUFerror(ERR_R_MALLOC_FAILURE);
123 return (0);
124 }
125 str->data = ret;
126 str->max = n;
127 str->length = len;
128
129 return (len);
130}
131
132void
133BUF_reverse(unsigned char *out, const unsigned char *in, size_t size)
134{
135 size_t i;
136
137 if (in) {
138 out += size - 1;
139 for (i = 0; i < size; i++)
140 *out-- = *in++;
141 } else {
142 unsigned char *q;
143 char c;
144 q = out + size - 1;
145 for (i = 0; i < size / 2; i++) {
146 c = *q;
147 *q-- = *out;
148 *out++ = c;
149 }
150 }
151}
diff --git a/src/lib/libcrypto/buffer/buffer.h b/src/lib/libcrypto/buffer/buffer.h
deleted file mode 100644
index c210bfd1c5..0000000000
--- a/src/lib/libcrypto/buffer/buffer.h
+++ /dev/null
@@ -1,118 +0,0 @@
1/* $OpenBSD: buffer.h,v 1.16 2022/07/12 14:42:48 kn Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#ifndef HEADER_BUFFER_H
60#define HEADER_BUFFER_H
61#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
62#define __bounded__(x, y, z)
63#endif
64
65#include <openssl/ossl_typ.h>
66
67#ifdef __cplusplus
68extern "C" {
69#endif
70
71#include <stddef.h>
72#include <sys/types.h>
73
74/* Already declared in ossl_typ.h */
75/* typedef struct buf_mem_st BUF_MEM; */
76
77struct buf_mem_st {
78 size_t length; /* current number of bytes */
79 char *data;
80 size_t max; /* size of buffer */
81};
82
83BUF_MEM *BUF_MEM_new(void);
84void BUF_MEM_free(BUF_MEM *a);
85int BUF_MEM_grow(BUF_MEM *str, size_t len);
86int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
87
88#ifndef LIBRESSL_INTERNAL
89char * BUF_strdup(const char *str);
90char * BUF_strndup(const char *str, size_t siz);
91void * BUF_memdup(const void *data, size_t siz);
92void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
93
94/* safe string functions */
95size_t BUF_strlcpy(char *dst, const char *src, size_t siz)
96 __attribute__ ((__bounded__(__string__,1,3)));
97size_t BUF_strlcat(char *dst, const char *src, size_t siz)
98 __attribute__ ((__bounded__(__string__,1,3)));
99#endif
100
101void ERR_load_BUF_strings(void);
102
103/* Error codes for the BUF functions. */
104
105/* Function codes. */
106#define BUF_F_BUF_MEMDUP 103
107#define BUF_F_BUF_MEM_GROW 100
108#define BUF_F_BUF_MEM_GROW_CLEAN 105
109#define BUF_F_BUF_MEM_NEW 101
110#define BUF_F_BUF_STRDUP 102
111#define BUF_F_BUF_STRNDUP 104
112
113/* Reason codes. */
114
115#ifdef __cplusplus
116}
117#endif
118#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-02-19 03:08:12 +0000