diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-21 11:14:47 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-21 11:14:47 +1000 |
| commit | a31635613323f7a1c28a96ff47cb360681faf9bd (patch) | |
| tree | 4aca234b796220a26c40ed28f90a1059598c1279 /util | |
| parent | b1415dc1820def1e9e344f9b83ad05c2a352ec56 (diff) | |
Fix merge error with libcrypto.num
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12929)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 1 |
1 files changed, 0 insertions, 1 deletions
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: |