recognise DECLARE_PEM_write_const, update ordinals

(backport from HEAD)

diff --git a/util/libeay.num b/util/libeay.num
index 93f80ba0c64f0a99c5be6022ba96f75e42dbad63..8cd5d5670c06c4975748e34efeed0a55e47b2098 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4310,3 +4310,12 @@ BIO_dgram_sctp_wait_for_dry             4679     EXIST::FUNCTION:SCTP
 BIO_s_datagram_sctp                     4680   EXIST::FUNCTION:DGRAM,SCTP
 BIO_dgram_is_sctp                       4681   EXIST::FUNCTION:SCTP
 BIO_dgram_sctp_notification_cb          4682   EXIST::FUNCTION:SCTP
+i2d_DHxparams                           4683   EXIST::FUNCTION:DH
+EC_curve_nist2nid                       4684   EXIST::FUNCTION:EC
+DH_get_1024_160                         4685   EXIST::FUNCTION:DH
+PEM_write_DHxparams                     4686   EXIST:!WIN16:FUNCTION:DH
+d2i_DHxparams                           4687   EXIST::FUNCTION:DH
+EC_curve_nid2nist                       4688   EXIST::FUNCTION:EC
+DH_get_2048_256                         4689   EXIST::FUNCTION:DH
+PEM_write_bio_DHxparams                 4690   EXIST::FUNCTION:DH
+DH_get_2048_224                         4691   EXIST::FUNCTION:DH

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 9a8c7b87d1af5463b87634d4f85a55bdc40c4153..a0452379ef647c3ba9f6b3797eb9b85470f93541 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -832,6 +832,7 @@ sub do_defs
                                        $def .= "int PEM_write_bio_$1(void);";
                                        next;
                                } elsif (/^DECLARE_PEM_write\s*\(\s*(\w*)\s*,/ ||
+                                       /^DECLARE_PEM_write_const\s*\(\s*(\w*)\s*,/ ||
                                         /^DECLARE_PEM_write_cb\s*\(\s*(\w*)\s*,/ ) {
                                        # Things not in Win16
                                        $def .=

diff --git a/util/ssleay.num b/util/ssleay.num
index 37655bc40a8395432657204f738f8871371e3ea8..ae0283f24a8133952d97efdb34ec9f23c1f9b30e 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -320,3 +320,4 @@ SSL_get_srtp_profiles                   360 EXIST::FUNCTION:
 SSL_CTX_set_next_proto_select_cb        361    EXIST:!VMS:FUNCTION:NEXTPROTONEG
 SSL_CTX_set_next_proto_sel_cb           361    EXIST:VMS:FUNCTION:NEXTPROTONEG
 SSL_SESSION_get_compress_id             362    EXIST::FUNCTION:
+SSL_get_sigalgs                         363    EXIST::FUNCTION:TLSEXT