summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/buffer
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2016-07-23 19:31:36 +0000
committercvs2svn <admin@example.com>2016-07-23 19:31:36 +0000
commit86c49b31af735796dfde37aa29473a30d36367db (patch)
treee9a354a92a348338fe2b361e2eda703cae23cfab /src/lib/libcrypto/buffer
parent19d5fe348e8926bac4521c5807aa64c45b8f7a41 (diff)
downloadopenbsd-OPENBSD_6_0_BASE.tar.gz
openbsd-OPENBSD_6_0_BASE.tar.bz2
openbsd-OPENBSD_6_0_BASE.zip
This commit was manufactured by cvs2git to create tag 'OPENBSD_6_0_BASE'.OPENBSD_6_0_BASE
Diffstat (limited to 'src/lib/libcrypto/buffer')
-rw-r--r--src/lib/libcrypto/buffer/buf_err.c99
-rw-r--r--src/lib/libcrypto/buffer/buf_str.c79
-rw-r--r--src/lib/libcrypto/buffer/buffer.c194
-rw-r--r--src/lib/libcrypto/buffer/buffer.h122
4 files changed, 0 insertions, 494 deletions
diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c
deleted file mode 100644
index 8256e89843..0000000000
--- a/src/lib/libcrypto/buffer/buf_err.c
+++ /dev/null
@@ -1,99 +0,0 @@
1/* $OpenBSD: buf_err.c,v 1.10 2014/07/10 22:45:56 jsing 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/* NOTE: this file was auto generated by the mkerr.pl script: any changes
57 * made to it will be overwritten when the script next updates this file,
58 * only reason strings will be preserved.
59 */
60
61#include <stdio.h>
62
63#include <openssl/opensslconf.h>
64
65#include <openssl/err.h>
66#include <openssl/buffer.h>
67
68/* BEGIN ERROR CODES */
69#ifndef OPENSSL_NO_ERR
70
71#define ERR_FUNC(func) ERR_PACK(ERR_LIB_BUF,func,0)
72#define ERR_REASON(reason) ERR_PACK(ERR_LIB_BUF,0,reason)
73
74static ERR_STRING_DATA BUF_str_functs[] = {
75 {ERR_FUNC(BUF_F_BUF_MEMDUP), "BUF_memdup"},
76 {ERR_FUNC(BUF_F_BUF_MEM_GROW), "BUF_MEM_grow"},
77 {ERR_FUNC(BUF_F_BUF_MEM_GROW_CLEAN), "BUF_MEM_grow_clean"},
78 {ERR_FUNC(BUF_F_BUF_MEM_NEW), "BUF_MEM_new"},
79 {ERR_FUNC(BUF_F_BUF_STRDUP), "BUF_strdup"},
80 {ERR_FUNC(BUF_F_BUF_STRNDUP), "BUF_strndup"},
81 {0, NULL}
82};
83
84static ERR_STRING_DATA BUF_str_reasons[] = {
85 {0, NULL}
86};
87
88#endif
89
90void
91ERR_load_BUF_strings(void)
92{
93#ifndef OPENSSL_NO_ERR
94 if (ERR_func_error_string(BUF_str_functs[0].error) == NULL) {
95 ERR_load_strings(0, BUF_str_functs);
96 ERR_load_strings(0, BUF_str_reasons);
97 }
98#endif
99}
diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c
deleted file mode 100644
index f7e4c0b966..0000000000
--- a/src/lib/libcrypto/buffer/buf_str.c
+++ /dev/null
@@ -1,79 +0,0 @@
1/* $OpenBSD: buf_str.c,v 1.9 2014/07/11 08:44:48 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)))
38 BUFerr(BUF_F_BUF_STRDUP, 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)))
50 BUFerr(BUF_F_BUF_STRNDUP, 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)))
62 BUFerr(BUF_F_BUF_MEMDUP, 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 ac3729d52b..0000000000
--- a/src/lib/libcrypto/buffer/buffer.c
+++ /dev/null
@@ -1,194 +0,0 @@
1/* $OpenBSD: buffer.c,v 1.21 2014/07/11 08:44:48 jsing 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/* LIMIT_BEFORE_EXPANSION is the maximum n such that (n+3)/3*4 < 2**31. That
67 * function is applied in several functions in this file and this limit ensures
68 * that the result fits in an int. */
69#define LIMIT_BEFORE_EXPANSION 0x5ffffffc
70
71BUF_MEM *
72BUF_MEM_new(void)
73{
74 BUF_MEM *ret;
75
76 ret = malloc(sizeof(BUF_MEM));
77 if (ret == NULL) {
78 BUFerr(BUF_F_BUF_MEM_NEW, ERR_R_MALLOC_FAILURE);
79 return (NULL);
80 }
81 ret->length = 0;
82 ret->max = 0;
83 ret->data = NULL;
84 return (ret);
85}
86
87void
88BUF_MEM_free(BUF_MEM *a)
89{
90 if (a == NULL)
91 return;
92
93 if (a->data != NULL) {
94 explicit_bzero(a->data, a->max);
95 free(a->data);
96 }
97 free(a);
98}
99
100int
101BUF_MEM_grow(BUF_MEM *str, size_t len)
102{
103 char *ret;
104 size_t n;
105
106 if (str->length >= len) {
107 str->length = len;
108 return (len);
109 }
110 if (str->max >= len) {
111 memset(&str->data[str->length], 0, len - str->length);
112 str->length = len;
113 return (len);
114 }
115 /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
116 if (len > LIMIT_BEFORE_EXPANSION) {
117 BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE);
118 return 0;
119 }
120 n = (len + 3) / 3 * 4;
121 ret = realloc(str->data, n);
122 if (ret == NULL) {
123 BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE);
124 len = 0;
125 } else {
126 str->data = ret;
127 str->max = n;
128 memset(&str->data[str->length], 0, len - str->length);
129 str->length = len;
130 }
131 return (len);
132}
133
134int
135BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
136{
137 char *ret;
138 size_t n;
139
140 if (str->length >= len) {
141 memset(&str->data[len], 0, str->length - len);
142 str->length = len;
143 return (len);
144 }
145 if (str->max >= len) {
146 memset(&str->data[str->length], 0, len - str->length);
147 str->length = len;
148 return (len);
149 }
150 /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
151 if (len > LIMIT_BEFORE_EXPANSION) {
152 BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE);
153 return 0;
154 }
155 n = (len + 3) / 3 * 4;
156 ret = malloc(n);
157 /* we're not shrinking - that case returns above */
158 if ((ret != NULL) && (str->data != NULL)) {
159 memcpy(ret, str->data, str->max);
160 explicit_bzero(str->data, str->max);
161 free(str->data);
162 }
163 if (ret == NULL) {
164 BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE);
165 len = 0;
166 } else {
167 str->data = ret;
168 str->max = n;
169 memset(&str->data[str->length], 0, len - str->length);
170 str->length = len;
171 }
172 return (len);
173}
174
175void
176BUF_reverse(unsigned char *out, const unsigned char *in, size_t size)
177{
178 size_t i;
179
180 if (in) {
181 out += size - 1;
182 for (i = 0; i < size; i++)
183 *out-- = *in++;
184 } else {
185 unsigned char *q;
186 char c;
187 q = out + size - 1;
188 for (i = 0; i < size / 2; i++) {
189 c = *q;
190 *q-- = *out;
191 *out++ = c;
192 }
193 }
194}
diff --git a/src/lib/libcrypto/buffer/buffer.h b/src/lib/libcrypto/buffer/buffer.h
deleted file mode 100644
index ed6dac0e69..0000000000
--- a/src/lib/libcrypto/buffer/buffer.h
+++ /dev/null
@@ -1,122 +0,0 @@
1/* $OpenBSD: buffer.h,v 1.15 2015/06/24 10:05:14 jsing 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
101/* BEGIN ERROR CODES */
102/* The following lines are auto generated by the script mkerr.pl. Any changes
103 * made after this point may be overwritten when the script is next run.
104 */
105void ERR_load_BUF_strings(void);
106
107/* Error codes for the BUF functions. */
108
109/* Function codes. */
110#define BUF_F_BUF_MEMDUP 103
111#define BUF_F_BUF_MEM_GROW 100
112#define BUF_F_BUF_MEM_GROW_CLEAN 105
113#define BUF_F_BUF_MEM_NEW 101
114#define BUF_F_BUF_STRDUP 102
115#define BUF_F_BUF_STRNDUP 104
116
117/* Reason codes. */
118
119#ifdef __cplusplus
120}
121#endif
122#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-05-09 10:39:01 +0000