Ooops, I forgot to include my patch in the last message. This patches
two files: util/mk1mf.pl and crypto/evp/e_aes.c (the latter was missing
the '#ifndef OPENSSL_NO_AES' check).

Enjoy,

-- 
Harald Koch     <[EMAIL PROTECTED]>

"It takes a child to raze a village."
                -Michael T. Fry

==== //depot/ThirdParty/dev/openssl-snapshot/util/mk1mf.pl#1 - 
/home/chk/work/ThirdParty/dev/openssl-snapshot/util/mk1mf.pl ====
@@ -56,5 +56,5 @@
        no-ripemd
        no-rc2 no-rc4 no-idea no-des no-bf no-cast - Skip this symetric cipher
-       no-rc5
+       no-rc5 no-aes
        no-rsa no-dsa no-dh                     - Skip this public key cipher
        no-ssl2 no-ssl3                         - Skip this version of SSL
@@ -198,4 +198,5 @@
 
 $cflags.=" -DOPENSSL_NO_IDEA" if $no_idea;
+$cflags.=" -DOPENSSL_NO_AES" if $no_aes;
 $cflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;
 $cflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;
@@ -625,4 +626,5 @@
 
        return("") if $no_idea && $dir =~ /\/idea/;
+       return("") if $no_aes  && $dir =~ /\/aes/;
        return("") if $no_rc2  && $dir =~ /\/rc2/;
        return("") if $no_rc4  && $dir =~ /\/rc4/;
@@ -651,4 +653,5 @@
        @a=grep(!/^e_.*_d$/,@a) if $no_des;
        @a=grep(!/^e_.*_i$/,@a) if $no_idea;
+       @a=grep(!/^e_.*_ae$/,@a) if $no_aes;
        @a=grep(!/^e_.*_r2$/,@a) if $no_rc2;
        @a=grep(!/^e_.*_r5$/,@a) if $no_rc5;
@@ -849,4 +852,5 @@
        elsif (/^no-rc5$/)      { $no_rc5=1; }
        elsif (/^no-idea$/)     { $no_idea=1; }
+       elsif (/^no-aes$/)      { $no_aes=1; }
        elsif (/^no-des$/)      { $no_des=1; }
        elsif (/^no-bf$/)       { $no_bf=1; }
@@ -874,5 +878,5 @@
        elsif (/^no-krb5$/)     { $no_krb5=1; }
 
-       elsif (/^just-ssl$/)    { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;
+       elsif (/^just-ssl$/)    { $no_rc2=$no_idea=$no_aes=$no_des=$no_bf=$no_cast=1;
                                  $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;
                                  $no_ssl2=$no_err=$no_rmd160=$no_rc5=1; }

==== //depot/ThirdParty/dev/openssl-snapshot/crypto/evp/e_aes.c#1 - 
/home/chk/work/ThirdParty/dev/openssl-snapshot/crypto/evp/e_aes.c ====
@@ -49,4 +49,5 @@
  */
 
+#ifndef OPENSSL_NO_AES
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -152,2 +153,3 @@
        }
 
+#endif

Reply via email to