From dd0b7078e17caecdc5d0080817f4ed3b9cc6e8b2 Mon Sep 17 00:00:00 2001 From: jsing Date: Sat, 25 Dec 2021 12:19:16 +0000 Subject: [PATCH] Merge evp_asn1.c into a_type.c - these are all ASN1_TYPE_* functions. No functional change. --- lib/libcrypto/Makefile | 4 +- lib/libcrypto/asn1/a_type.c | 134 ++++++++++++++++++++++- lib/libcrypto/asn1/evp_asn1.c | 193 ---------------------------------- 3 files changed, 134 insertions(+), 197 deletions(-) delete mode 100644 lib/libcrypto/asn1/evp_asn1.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 9b9d448fa2f..dd5caec2197 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2021/12/25 12:00:22 jsing Exp $ +# $OpenBSD: Makefile,v 1.62 2021/12/25 12:19:16 jsing Exp $ LIB= crypto LIBREBUILD=y @@ -64,7 +64,7 @@ SRCS+= tasn_prn.c ameth_lib.c SRCS+= n_pkey.c SRCS+= x_pkey.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c SRCS+= asn1_gen.c asn1_par.c asn1_old_lib.c asn1_err.c a_strnid.c -SRCS+= evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c +SRCS+= asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c SRCS+= a_time_tm.c asn1_item.c asn1_old.c asn1_types.c asn1_lib.c # bf/ diff --git a/lib/libcrypto/asn1/a_type.c b/lib/libcrypto/asn1/a_type.c index 23fa9f602c7..61609c38f7b 100644 --- a/lib/libcrypto/asn1/a_type.c +++ b/lib/libcrypto/asn1/a_type.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_type.c,v 1.22 2021/12/25 08:52:44 jsing Exp $ */ +/* $OpenBSD: a_type.c,v 1.23 2021/12/25 12:19:16 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,39 @@ * [including the GNU Public Licence.] */ -#include +#include #include +#include #include +typedef struct { + ASN1_INTEGER *num; + ASN1_OCTET_STRING *value; +} ASN1_int_octetstring; + +static const ASN1_TEMPLATE ASN1_INT_OCTETSTRING_seq_tt[] = { + { + .offset = offsetof(ASN1_int_octetstring, num), + .field_name = "num", + .item = &ASN1_INTEGER_it, + }, + { + .offset = offsetof(ASN1_int_octetstring, value), + .field_name = "value", + .item = &ASN1_OCTET_STRING_it, + }, +}; + +const ASN1_ITEM ASN1_INT_OCTETSTRING_it = { + .itype = ASN1_ITYPE_SEQUENCE, + .utype = V_ASN1_SEQUENCE, + .templates = ASN1_INT_OCTETSTRING_seq_tt, + .tcount = sizeof(ASN1_INT_OCTETSTRING_seq_tt) / sizeof(ASN1_TEMPLATE), + .size = sizeof(ASN1_int_octetstring), + .sname = "ASN1_INT_OCTETSTRING", +}; + ASN1_TYPE * ASN1_TYPE_new(void) { @@ -167,6 +195,108 @@ ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b) return result; } +int +ASN1_TYPE_set_octetstring(ASN1_TYPE *a, const unsigned char *data, int len) +{ + ASN1_STRING *os; + + if ((os = ASN1_OCTET_STRING_new()) == NULL) + return (0); + if (!ASN1_STRING_set(os, data, len)) { + ASN1_OCTET_STRING_free(os); + return (0); + } + ASN1_TYPE_set(a, V_ASN1_OCTET_STRING, os); + return (1); +} + +int +ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_len) +{ + int ret, num; + unsigned char *p; + + if ((a->type != V_ASN1_OCTET_STRING) || + (a->value.octet_string == NULL)) { + ASN1error(ASN1_R_DATA_IS_WRONG); + return (-1); + } + p = ASN1_STRING_data(a->value.octet_string); + ret = ASN1_STRING_length(a->value.octet_string); + if (ret < max_len) + num = ret; + else + num = max_len; + memcpy(data, p, num); + return (ret); +} + +int +ASN1_TYPE_set_int_octetstring(ASN1_TYPE *at, long num, const unsigned char *data, + int len) +{ + ASN1_int_octetstring *ios; + ASN1_STRING *sp = NULL; + int ret = 0; + + if ((ios = (ASN1_int_octetstring *)ASN1_item_new( + &ASN1_INT_OCTETSTRING_it)) == NULL) + goto err; + if (!ASN1_INTEGER_set(ios->num, num)) + goto err; + if (!ASN1_OCTET_STRING_set(ios->value, data, len)) + goto err; + + if ((sp = ASN1_item_pack(ios, &ASN1_INT_OCTETSTRING_it, NULL)) == NULL) + goto err; + + ASN1_TYPE_set(at, V_ASN1_SEQUENCE, sp); + sp = NULL; + + ret = 1; + + err: + ASN1_item_free((ASN1_VALUE *)ios, &ASN1_INT_OCTETSTRING_it); + ASN1_STRING_free(sp); + + return ret; +} + +int +ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *at, long *num, unsigned char *data, + int max_len) +{ + ASN1_STRING *sp = at->value.sequence; + ASN1_int_octetstring *ios = NULL; + int ret = -1; + int len; + + if (at->type != V_ASN1_SEQUENCE || sp == NULL) + goto err; + + if ((ios = ASN1_item_unpack(sp, &ASN1_INT_OCTETSTRING_it)) == NULL) + goto err; + + if (num != NULL) + *num = ASN1_INTEGER_get(ios->num); + if (data != NULL) { + len = ASN1_STRING_length(ios->value); + if (len > max_len) + len = max_len; + memcpy(data, ASN1_STRING_data(ios->value), len); + } + + ret = ASN1_STRING_length(ios->value); + + err: + ASN1_item_free((ASN1_VALUE *)ios, &ASN1_INT_OCTETSTRING_it); + + if (ret == -1) + ASN1error(ASN1_R_DATA_IS_WRONG); + + return ret; +} + ASN1_TYPE * ASN1_TYPE_pack_sequence(const ASN1_ITEM *it, void *s, ASN1_TYPE **t) { diff --git a/lib/libcrypto/asn1/evp_asn1.c b/lib/libcrypto/asn1/evp_asn1.c deleted file mode 100644 index 4b7ebbb0224..00000000000 --- a/lib/libcrypto/asn1/evp_asn1.c +++ /dev/null @@ -1,193 +0,0 @@ -/* $OpenBSD: evp_asn1.c,v 1.23 2018/11/09 04:20:27 tb Exp $ */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include - -#include -#include -#include - -int -ASN1_TYPE_set_octetstring(ASN1_TYPE *a, const unsigned char *data, int len) -{ - ASN1_STRING *os; - - if ((os = ASN1_OCTET_STRING_new()) == NULL) - return (0); - if (!ASN1_STRING_set(os, data, len)) { - ASN1_OCTET_STRING_free(os); - return (0); - } - ASN1_TYPE_set(a, V_ASN1_OCTET_STRING, os); - return (1); -} - -int -ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_len) -{ - int ret, num; - unsigned char *p; - - if ((a->type != V_ASN1_OCTET_STRING) || - (a->value.octet_string == NULL)) { - ASN1error(ASN1_R_DATA_IS_WRONG); - return (-1); - } - p = ASN1_STRING_data(a->value.octet_string); - ret = ASN1_STRING_length(a->value.octet_string); - if (ret < max_len) - num = ret; - else - num = max_len; - memcpy(data, p, num); - return (ret); -} - -typedef struct { - ASN1_INTEGER *num; - ASN1_OCTET_STRING *value; -} ASN1_int_octetstring; - -static const ASN1_TEMPLATE ASN1_INT_OCTETSTRING_seq_tt[] = { - { - .offset = offsetof(ASN1_int_octetstring, num), - .field_name = "num", - .item = &ASN1_INTEGER_it, - }, - { - .offset = offsetof(ASN1_int_octetstring, value), - .field_name = "value", - .item = &ASN1_OCTET_STRING_it, - }, -}; - -const ASN1_ITEM ASN1_INT_OCTETSTRING_it = { - .itype = ASN1_ITYPE_SEQUENCE, - .utype = V_ASN1_SEQUENCE, - .templates = ASN1_INT_OCTETSTRING_seq_tt, - .tcount = sizeof(ASN1_INT_OCTETSTRING_seq_tt) / sizeof(ASN1_TEMPLATE), - .size = sizeof(ASN1_int_octetstring), - .sname = "ASN1_INT_OCTETSTRING", -}; - -int -ASN1_TYPE_set_int_octetstring(ASN1_TYPE *at, long num, const unsigned char *data, - int len) -{ - ASN1_int_octetstring *ios; - ASN1_STRING *sp = NULL; - int ret = 0; - - if ((ios = (ASN1_int_octetstring *)ASN1_item_new( - &ASN1_INT_OCTETSTRING_it)) == NULL) - goto err; - if (!ASN1_INTEGER_set(ios->num, num)) - goto err; - if (!ASN1_OCTET_STRING_set(ios->value, data, len)) - goto err; - - if ((sp = ASN1_item_pack(ios, &ASN1_INT_OCTETSTRING_it, NULL)) == NULL) - goto err; - - ASN1_TYPE_set(at, V_ASN1_SEQUENCE, sp); - sp = NULL; - - ret = 1; - - err: - ASN1_item_free((ASN1_VALUE *)ios, &ASN1_INT_OCTETSTRING_it); - ASN1_STRING_free(sp); - - return ret; -} - -int -ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *at, long *num, unsigned char *data, - int max_len) -{ - ASN1_STRING *sp = at->value.sequence; - ASN1_int_octetstring *ios = NULL; - int ret = -1; - int len; - - if (at->type != V_ASN1_SEQUENCE || sp == NULL) - goto err; - - if ((ios = ASN1_item_unpack(sp, &ASN1_INT_OCTETSTRING_it)) == NULL) - goto err; - - if (num != NULL) - *num = ASN1_INTEGER_get(ios->num); - if (data != NULL) { - len = ASN1_STRING_length(ios->value); - if (len > max_len) - len = max_len; - memcpy(data, ASN1_STRING_data(ios->value), len); - } - - ret = ASN1_STRING_length(ios->value); - - err: - ASN1_item_free((ASN1_VALUE *)ios, &ASN1_INT_OCTETSTRING_it); - - if (ret == -1) - ASN1error(ASN1_R_DATA_IS_WRONG); - - return ret; -} -- 2.20.1