The branch master has been updated
via a31635613323f7a1c28a96ff47cb360681faf9bd (commit)
from b1415dc1820def1e9e344f9b83ad05c2a352ec56 (commit)
- Log -----------------------------------------------------------------
commit a31635613323f7a1c28a96ff47cb360681faf9bd
Author: Shane Lontis <shane.lon...@oracle.com>
Date: Mon Sep 21 11:14:47 2020 +1000
Fix merge error with libcrypto.num
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12929)
-----------------------------------------------------------------------
Summary of changes:
util/libcrypto.num | 1 -
1 file changed, 1 deletion(-)
diff --git a/util/libcrypto.num b/util/libcrypto.num
index e414a6443b..3658d14c29 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:
