recognise HEARTBEATS in mkdef.pl script

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 193e1e10cf74f3938f6eff7aba814a5a81972bce..13cf2aa19c4adf12ab237f05faefaf9e57747570 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -101,7 +101,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         # RFC3779
                         "RFC3779",
                         # TLS
-                        "TLSEXT", "PSK", "SRP",
+                        "TLSEXT", "PSK", "SRP", "HEARTBEATS",
                         # CMS
                         "CMS",
                         # CryptoAPI Engine
@@ -115,7 +115,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         # Deprecated functions
                         "DEPRECATED",
                         # Hide SSL internals
-                        "SSL_INTERN");
+                        "SSL_INTERN",
+                        # SCTP
+                        "SCTP");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -135,7 +137,7 @@ my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 my $no_jpake; my $no_ssl2; my $no_ec2m; my $no_nextprotoneg;
-my $no_srp; my $no_nistp_gcc;
+my $no_srp; my $no_nistp_gcc; my $no_sctp;
 
 my $fips;
 
@@ -233,6 +235,7 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-capieng$/)  { $no_capieng=1; }
        elsif (/^no-jpake$/)    { $no_jpake=1; }
        elsif (/^no-srp$/)      { $no_srp=1; }
+       elsif (/^no-sctp$/)     { $no_sctp=1; }
        }
 
 
@@ -830,6 +833,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 .=
@@ -1199,6 +1203,7 @@ sub is_valid
                        if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
                        if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
                        if ($keyword eq "SRP" && $no_srp) { return 0; }
+                       if ($keyword eq "SCTP" && $no_sctp) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
                        # Nothing recognise as true