Fix no-ocb for Windows

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/util/libeay.num b/util/libeay.num
index 68590811648e540f20b10ccd4b3dd5517e64544b..03f0d39c061a6c6eb98ad2cc1bbec6155340d3d0 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4515,21 +4515,21 @@ i2s_ASN1_IA5STRING                      4874    EXIST::FUNCTION:
 s2i_ASN1_IA5STRING                      4875   EXIST::FUNCTION:
 FIPS_dsa_sign_ctx                       4876   NOEXIST::FUNCTION:
 CRYPTO_ocb128_release                   4878   NOEXIST::FUNCTION:
-CRYPTO_ocb128_new                       4879   EXIST::FUNCTION:
-CRYPTO_ocb128_finish                    4880   EXIST::FUNCTION:
-EVP_aes_256_ocb                         4881   EXIST::FUNCTION:AES
-CRYPTO_ocb128_setiv                     4882   EXIST::FUNCTION:
-CRYPTO_ocb128_aad                       4883   EXIST::FUNCTION:
-CRYPTO_ocb128_decrypt                   4884   EXIST::FUNCTION:
-CRYPTO_ocb128_tag                       4885   EXIST::FUNCTION:
-EVP_aes_192_ocb                         4886   EXIST::FUNCTION:AES
-EVP_aes_128_ocb                         4887   EXIST::FUNCTION:AES
-CRYPTO_ocb128_init                      4888   EXIST::FUNCTION:
-CRYPTO_ocb128_encrypt                   4889   EXIST::FUNCTION:
-CRYPTO_ocb128_copy_ctx                  4890   EXIST::FUNCTION:
+CRYPTO_ocb128_new                       4879   EXIST::FUNCTION:OCB
+CRYPTO_ocb128_finish                    4880   EXIST::FUNCTION:OCB
+EVP_aes_256_ocb                         4881   EXIST::FUNCTION:AES,OCB
+CRYPTO_ocb128_setiv                     4882   EXIST::FUNCTION:OCB
+CRYPTO_ocb128_aad                       4883   EXIST::FUNCTION:OCB
+CRYPTO_ocb128_decrypt                   4884   EXIST::FUNCTION:OCB
+CRYPTO_ocb128_tag                       4885   EXIST::FUNCTION:OCB
+EVP_aes_192_ocb                         4886   EXIST::FUNCTION:AES,OCB
+EVP_aes_128_ocb                         4887   EXIST::FUNCTION:AES,OCB
+CRYPTO_ocb128_init                      4888   EXIST::FUNCTION:OCB
+CRYPTO_ocb128_encrypt                   4889   EXIST::FUNCTION:OCB
+CRYPTO_ocb128_copy_ctx                  4890   EXIST::FUNCTION:OCB
 BN_is_word                              4891   EXIST::FUNCTION:
 BN_GENCB_set                            4892   EXIST::FUNCTION:
-CRYPTO_ocb128_cleanup                   4893   EXIST::FUNCTION:
+CRYPTO_ocb128_cleanup                   4893   EXIST::FUNCTION:OCB
 BN_GENCB_set_old                        4894   EXIST::FUNCTION:
 BN_is_zero                              4895   EXIST::FUNCTION:
 BN_with_flags                           4896   EXIST::FUNCTION:

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 5424ed543cdc3170f96407b25b666d7cdb6c3e1f..01329b74ef12c5111940606fc4f20226308a2d23 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1457,6 +1457,7 @@ sub read_options
                "no-ssl-trace" => 0,
                "no-unit-test" => 0,
                "no-deprecated" => 0,
+               "no-ocb" => 0,
                "fips" => \$fips,
                "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
                "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 1dbd55579743dc32cc11e59694f6d395b5ab3c6b..b67d14be57c24ae70efa750baec54b5a573b0558 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -120,7 +120,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         # SSL TRACE
                         "SSL_TRACE",
                         # Unit testing
-                        "UNIT_TEST");
+                        "UNIT_TEST",
+                        # OCB mode
+                        "OCB");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -141,7 +143,7 @@ my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; 
 my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace;
-my $no_unit_test; my $no_ssl3_method;
+my $no_unit_test; my $no_ssl3_method; my $no_ocb;
 
 my $fips;
 
@@ -243,6 +245,7 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-srtp$/)     { $no_srtp=1; }
        elsif (/^no-unit-test$/){ $no_unit_test=1; }
        elsif (/^no-deprecated$/) { $no_deprecated=1; }
+       elsif (/^no-ocb/){ $no_ocb=1; }
        }
 
 
@@ -1221,6 +1224,7 @@ sub is_valid
                        if ($keyword eq "SRTP" && $no_srtp) { return 0; }
                        if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
+                       if ($keyword eq "OCB" && $no_ocb) { return 0; }
 
                        # Nothing recognise as true
                        return 1;