From 86f7b042124b3395a9c9b8dacc02dbba579ca0e8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 18 Nov 2016 18:17:20 +0100 Subject: [PATCH] Make asn1_d2i_read_bio accessible from STORE This is needed for the upcoming "file" scheme STORE loader. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/3542) --- crypto/asn1/a_d2i_fp.c | 5 ++--- crypto/include/internal/asn1_int.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c index e5c1d0ed70..5fa4d0fa71 100644 --- a/crypto/asn1/a_d2i_fp.c +++ b/crypto/asn1/a_d2i_fp.c @@ -13,8 +13,7 @@ #include "internal/numbers.h" #include #include - -static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb); +#include "internal/asn1_int.h" #ifndef NO_OLD_ASN1 # ifndef OPENSSL_NO_STDIO @@ -92,7 +91,7 @@ void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x) #define HEADER_SIZE 8 #define ASN1_CHUNK_INITIAL_SIZE (16 * 1024) -static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb) +int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb) { BUF_MEM *b; unsigned char *p; diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h index a2e2b17b6a..8ff919c8fa 100644 --- a/crypto/include/internal/asn1_int.h +++ b/crypto/include/internal/asn1_int.h @@ -99,3 +99,4 @@ struct asn1_pctx_st { } /* ASN1_PCTX */ ; int asn1_valid_host(const ASN1_STRING *host); +int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb); -- 2.25.1