diff options
| author | cvs2svn <admin@example.com> | 2015-03-08 16:48:48 +0000 |
|---|---|---|
| committer | cvs2svn <admin@example.com> | 2015-03-08 16:48:48 +0000 |
| commit | da1a9ad3a4a867ba6569c05e6fca66d7f296c553 (patch) | |
| tree | 44872802e872bdfd60730fa9cf01d9d5751251c1 /src/lib/libcrypto/asn1/a_d2i_fp.c | |
| parent | 973703db67a8e73d70e63afa8f2cde19da09144d (diff) | |
| download | openbsd-OPENBSD_5_7_BASE.tar.gz openbsd-OPENBSD_5_7_BASE.tar.bz2 openbsd-OPENBSD_5_7_BASE.zip | |
This commit was manufactured by cvs2git to create tag 'OPENBSD_5_7_BASE'.OPENBSD_5_7_BASE
Diffstat (limited to 'src/lib/libcrypto/asn1/a_d2i_fp.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_d2i_fp.c | 271 |
1 files changed, 0 insertions, 271 deletions
diff --git a/src/lib/libcrypto/asn1/a_d2i_fp.c b/src/lib/libcrypto/asn1/a_d2i_fp.c deleted file mode 100644 index c0fb0a3802..0000000000 --- a/src/lib/libcrypto/asn1/a_d2i_fp.c +++ /dev/null | |||
| @@ -1,271 +0,0 @@ | |||
| 1 | /* $OpenBSD: a_d2i_fp.c,v 1.11 2014/07/13 11:10:20 miod 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 <limits.h> | ||
| 60 | #include <stdio.h> | ||
| 61 | |||
| 62 | #include <openssl/asn1.h> | ||
| 63 | #include <openssl/buffer.h> | ||
| 64 | #include <openssl/err.h> | ||
| 65 | |||
| 66 | static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb); | ||
| 67 | |||
| 68 | #ifndef NO_OLD_ASN1 | ||
| 69 | |||
| 70 | void * | ||
| 71 | ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x) | ||
| 72 | { | ||
| 73 | BIO *b; | ||
| 74 | void *ret; | ||
| 75 | |||
| 76 | if ((b = BIO_new(BIO_s_file())) == NULL) { | ||
| 77 | ASN1err(ASN1_F_ASN1_D2I_FP, ERR_R_BUF_LIB); | ||
| 78 | return (NULL); | ||
| 79 | } | ||
| 80 | BIO_set_fp(b, in, BIO_NOCLOSE); | ||
| 81 | ret = ASN1_d2i_bio(xnew, d2i, b, x); | ||
| 82 | BIO_free(b); | ||
| 83 | return (ret); | ||
| 84 | } | ||
| 85 | |||
| 86 | void * | ||
| 87 | ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x) | ||
| 88 | { | ||
| 89 | BUF_MEM *b = NULL; | ||
| 90 | const unsigned char *p; | ||
| 91 | void *ret = NULL; | ||
| 92 | int len; | ||
| 93 | |||
| 94 | len = asn1_d2i_read_bio(in, &b); | ||
| 95 | if (len < 0) | ||
| 96 | goto err; | ||
| 97 | |||
| 98 | p = (unsigned char *)b->data; | ||
| 99 | ret = d2i(x, &p, len); | ||
| 100 | |||
| 101 | err: | ||
| 102 | if (b != NULL) | ||
| 103 | BUF_MEM_free(b); | ||
| 104 | return (ret); | ||
| 105 | } | ||
| 106 | |||
| 107 | #endif | ||
| 108 | |||
| 109 | void * | ||
| 110 | ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x) | ||
| 111 | { | ||
| 112 | BUF_MEM *b = NULL; | ||
| 113 | const unsigned char *p; | ||
| 114 | void *ret = NULL; | ||
| 115 | int len; | ||
| 116 | |||
| 117 | len = asn1_d2i_read_bio(in, &b); | ||
| 118 | if (len < 0) | ||
| 119 | goto err; | ||
| 120 | |||
| 121 | p = (const unsigned char *)b->data; | ||
| 122 | ret = ASN1_item_d2i(x, &p, len, it); | ||
| 123 | |||
| 124 | err: | ||
| 125 | if (b != NULL) | ||
| 126 | BUF_MEM_free(b); | ||
| 127 | return (ret); | ||
| 128 | } | ||
| 129 | |||
| 130 | void * | ||
| 131 | ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x) | ||
| 132 | { | ||
| 133 | BIO *b; | ||
| 134 | char *ret; | ||
| 135 | |||
| 136 | if ((b = BIO_new(BIO_s_file())) == NULL) { | ||
| 137 | ASN1err(ASN1_F_ASN1_ITEM_D2I_FP, ERR_R_BUF_LIB); | ||
| 138 | return (NULL); | ||
| 139 | } | ||
| 140 | BIO_set_fp(b, in, BIO_NOCLOSE); | ||
| 141 | ret = ASN1_item_d2i_bio(it, b, x); | ||
| 142 | BIO_free(b); | ||
| 143 | return (ret); | ||
| 144 | } | ||
| 145 | |||
| 146 | #define HEADER_SIZE 8 | ||
| 147 | static int | ||
| 148 | asn1_d2i_read_bio(BIO *in, BUF_MEM **pb) | ||
| 149 | { | ||
| 150 | BUF_MEM *b; | ||
| 151 | unsigned char *p; | ||
| 152 | int i; | ||
| 153 | ASN1_const_CTX c; | ||
| 154 | size_t want = HEADER_SIZE; | ||
| 155 | int eos = 0; | ||
| 156 | size_t off = 0; | ||
| 157 | size_t len = 0; | ||
| 158 | |||
| 159 | b = BUF_MEM_new(); | ||
| 160 | if (b == NULL) { | ||
| 161 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE); | ||
| 162 | return -1; | ||
| 163 | } | ||
| 164 | |||
| 165 | ERR_clear_error(); | ||
| 166 | for (;;) { | ||
| 167 | if (want >= (len - off)) { | ||
| 168 | want -= (len - off); | ||
| 169 | |||
| 170 | if (len + want < len || !BUF_MEM_grow_clean(b, len + want)) { | ||
| 171 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE); | ||
| 172 | goto err; | ||
| 173 | } | ||
| 174 | i = BIO_read(in, &(b->data[len]), want); | ||
| 175 | if ((i < 0) && ((len - off) == 0)) { | ||
| 176 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_NOT_ENOUGH_DATA); | ||
| 177 | goto err; | ||
| 178 | } | ||
| 179 | if (i > 0) { | ||
| 180 | if (len + i < len) { | ||
| 181 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG); | ||
| 182 | goto err; | ||
| 183 | } | ||
| 184 | len += i; | ||
| 185 | } | ||
| 186 | } | ||
| 187 | /* else data already loaded */ | ||
| 188 | |||
| 189 | p = (unsigned char *) & (b->data[off]); | ||
| 190 | c.p = p; | ||
| 191 | c.inf = ASN1_get_object(&(c.p), &(c.slen), &(c.tag), | ||
| 192 | &(c.xclass), len - off); | ||
| 193 | if (c.inf & 0x80) { | ||
| 194 | unsigned long e; | ||
| 195 | |||
| 196 | e = ERR_GET_REASON(ERR_peek_error()); | ||
| 197 | if (e != ASN1_R_TOO_LONG) | ||
| 198 | goto err; | ||
| 199 | else | ||
| 200 | ERR_clear_error(); /* clear error */ | ||
| 201 | } | ||
| 202 | i = c.p - p; /* header length */ | ||
| 203 | off += i; /* end of data */ | ||
| 204 | |||
| 205 | if (c.inf & 1) { | ||
| 206 | /* no data body so go round again */ | ||
| 207 | eos++; | ||
| 208 | if (eos < 0) { | ||
| 209 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_HEADER_TOO_LONG); | ||
| 210 | goto err; | ||
| 211 | } | ||
| 212 | want = HEADER_SIZE; | ||
| 213 | } else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC)) { | ||
| 214 | /* eos value, so go back and read another header */ | ||
| 215 | eos--; | ||
| 216 | if (eos <= 0) | ||
| 217 | break; | ||
| 218 | else | ||
| 219 | want = HEADER_SIZE; | ||
| 220 | } else { | ||
| 221 | /* suck in c.slen bytes of data */ | ||
| 222 | want = c.slen; | ||
| 223 | if (want > (len - off)) { | ||
| 224 | want -= (len - off); | ||
| 225 | if (want > INT_MAX /* BIO_read takes an int length */ || | ||
| 226 | len+want < len) { | ||
| 227 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG); | ||
| 228 | goto err; | ||
| 229 | } | ||
| 230 | if (!BUF_MEM_grow_clean(b, len + want)) { | ||
| 231 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE); | ||
| 232 | goto err; | ||
| 233 | } | ||
| 234 | while (want > 0) { | ||
| 235 | i = BIO_read(in, &(b->data[len]), want); | ||
| 236 | if (i <= 0) { | ||
| 237 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, | ||
| 238 | ASN1_R_NOT_ENOUGH_DATA); | ||
| 239 | goto err; | ||
| 240 | } | ||
| 241 | /* This can't overflow because | ||
| 242 | * |len+want| didn't overflow. */ | ||
| 243 | len += i; | ||
| 244 | want -= i; | ||
| 245 | } | ||
| 246 | } | ||
| 247 | if (off + c.slen < off) { | ||
| 248 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG); | ||
| 249 | goto err; | ||
| 250 | } | ||
| 251 | off += c.slen; | ||
| 252 | if (eos <= 0) { | ||
| 253 | break; | ||
| 254 | } else | ||
| 255 | want = HEADER_SIZE; | ||
| 256 | } | ||
| 257 | } | ||
| 258 | |||
| 259 | if (off > INT_MAX) { | ||
| 260 | ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG); | ||
| 261 | goto err; | ||
| 262 | } | ||
| 263 | |||
| 264 | *pb = b; | ||
| 265 | return off; | ||
| 266 | |||
| 267 | err: | ||
| 268 | if (b != NULL) | ||
| 269 | BUF_MEM_free(b); | ||
| 270 | return -1; | ||
| 271 | } | ||
