util/libcrypto.num: fix symbol collision between 1.1.0 and master
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Wed, 16 May 2018 20:53:41 +0000 (22:53 +0200)
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Sun, 27 May 2018 07:50:03 +0000 (09:50 +0200)
commite37d4a6704cf0c8b0a0a6601eff82ca65d16d4a3
treecea5d4ee84b6d57c4fb46d25977b5c84ecc649ba
parent4de3fe5381b647de4b93436c5138ad16e575056c
util/libcrypto.num: fix symbol collision between 1.1.0 and master

In commit 6decf9436f7, fourteen public symbols were removed from
util/libcrypto.num on the master branch and the following symbols
renumbered. Unfortunately, the symbols `OCSP_resp_get0_signer` and
`X509_get0_authority_key_id` were not adjusted accordingly on the
OpenSSL_1_1_0-stable branch. This commit fixes the collision by
doing a 'double swap'.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6278)
util/libcrypto.num