From: Shane Lontis Date: Mon, 21 Sep 2020 01:14:47 +0000 (+1000) Subject: Fix merge error with libcrypto.num X-Git-Tag: openssl-3.0.0-alpha7~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a31635613323f7a1c28a96ff47cb360681faf9bd;p=thirdparty%2Fopenssl.git Fix merge error with libcrypto.num Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12929) --- diff --git a/util/libcrypto.num b/util/libcrypto.num index e414a6443b1..3658d14c294 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5312,4 +5312,3 @@ OSSL_ENCODER_CTX_set_cleanup ? 3_0_0 EXIST::FUNCTION: OSSL_DECODER_INSTANCE_get_input_type ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_set_passphrase_cb ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_typenames_do_all ? 3_0_0 EXIST::FUNCTION: -OSSL_DECODER_INSTANCE_get_input_type ? 3_0_0 EXIST::FUNCTION: