← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openssl/karmic-proposed

« back to all changes in this revision

Viewing changes to util/mk1mf.pl

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-05 00:13:39 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071205001339-tazlol313zs8u6ec
Tags: 0.9.8g-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure: Add support for lpia.
  - Replace duplicate files in the doc directory with symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/mk1mf.pl
63
63
        no-md2 no-md4 no-md5 no-sha no-mdc2     - Skip this digest
64
64
        no-ripemd
65
65
        no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
66
 
        no-bf no-cast no-aes no-camellia
 
66
        no-bf no-cast no-aes no-camellia no-seed
67
67
        no-rsa no-dsa no-dh                     - Skip this public key cipher
68
68
        no-ssl2 no-ssl3                         - Skip this version of SSL
69
69
        just-ssl                                - remove all non-ssl keys/digest
198
198
$cflags.=" -DOPENSSL_NO_IDEA" if $no_idea;
199
199
$cflags.=" -DOPENSSL_NO_AES"  if $no_aes;
200
200
$cflags.=" -DOPENSSL_NO_CAMELLIA"  if $no_camellia;
 
201
$cflags.=" -DOPENSSL_NO_SEED" if $no_seed;
201
202
$cflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;
202
203
$cflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;
203
204
$cflags.=" -DOPENSSL_NO_RC5"  if $no_rc5;
217
218
$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
218
219
$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
219
220
$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 
221
$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
220
222
$cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
221
223
$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
222
224
$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
394
396
LFLAGS=$lflags
395
397
RSC=$rsc
396
398
 
 
399
AES_ASM_OBJ=$aes_asm_obj
 
400
AES_ASM_SRC=$aes_asm_src
397
401
BN_ASM_OBJ=$bn_asm_obj
398
402
BN_ASM_SRC=$bn_asm_src
399
403
BNCO_ASM_OBJ=$bnco_asm_obj
607
611
                $rules.="\$(O_SSL):\n\n"; 
608
612
                next;
609
613
                }
610
 
 
 
614
        if (($aes_asm_obj ne "") && ($_ eq "CRYPTO"))
 
615
                {
 
616
                $lib_obj =~ s/\s(\S*\/aes_core\S*)/ \$(AES_ASM_OBJ)/;
 
617
                $lib_obj =~ s/\s\S*\/aes_cbc\S*//;
 
618
                $rules.=&do_asm_rule($aes_asm_obj,$aes_asm_src);
 
619
                }
611
620
        if (($bn_asm_obj ne "") && ($_ eq "CRYPTO"))
612
621
                {
613
622
                $lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/;
730
739
        return("") if $no_idea && $dir =~ /\/idea/;
731
740
        return("") if $no_aes  && $dir =~ /\/aes/;
732
741
        return("") if $no_camellia  && $dir =~ /\/camellia/;
 
742
        return("") if $no_seed && $dir =~ /\/seed/;
733
743
        return("") if $no_rc2  && $dir =~ /\/rc2/;
734
744
        return("") if $no_rc4  && $dir =~ /\/rc4/;
735
745
        return("") if $no_rc5  && $dir =~ /\/rc5/;
764
774
        @a=grep(!/^e_.*_c$/,@a) if $no_cast;
765
775
        @a=grep(!/^e_rc4$/,@a) if $no_rc4;
766
776
        @a=grep(!/^e_camellia$/,@a) if $no_camellia;
 
777
        @a=grep(!/^e_seed$/,@a) if $no_seed;
767
778
 
768
779
        @a=grep(!/(^s2_)|(^s23_)/,@a) if $no_ssl2;
769
780
        @a=grep(!/(^s3_)|(^s23_)/,@a) if $no_ssl3;
847
858
                elsif ($_ =~ /RC5_ENC/) { $t="$_ "; }
848
859
                elsif ($_ =~ /MD5_ASM/) { $t="$_ "; }
849
860
                elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; }
 
861
                elsif ($_ =~ /AES_ASM/){ $t="$_ "; }
850
862
                elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; }
851
863
                elsif ($_ =~ /CPUID_ASM/){ $t="$_ "; }
852
864
                else    { $t="$location${o}$_$pf "; }
976
988
                "no-idea" => \$no_idea,
977
989
                "no-aes" => \$no_aes,
978
990
                "no-camellia" => \$no_camellia,
 
991
                "no-seed" => \$no_seed,
979
992
                "no-des" => \$no_des,
980
993
                "no-bf" => \$no_bf,
981
994
                "no-cast" => \$no_cast,
992
1005
                "no-dsa" => \$no_dsa,
993
1006
                "no-dh" => \$no_dh,
994
1007
                "no-hmac" => \$no_hmac,
995
 
                "no-aes" => \$no_aes,
996
 
                "no-camellia" => \$no_camellia,
997
1008
                "no-asm" => \$no_asm,
998
1009
                "nasm" => \$nasm,
999
1010
                "nw-nasm" => \$nw_nasm,
1001
1012
                "gaswin" => \$gaswin,
1002
1013
                "no-ssl2" => \$no_ssl2,
1003
1014
                "no-ssl3" => \$no_ssl3,
 
1015
                "no-tlsext" => \$no_tlsext,
1004
1016
                "no-err" => \$no_err,
1005
1017
                "no-sock" => \$no_sock,
1006
1018
                "no-krb5" => \$no_krb5,
1013
1025
                        [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
1014
1026
                          \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
1015
1027
                          \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
1016
 
                          \$no_aes, \$no_camellia],
 
1028
                          \$no_aes, \$no_camellia, \$no_seed],
1017
1029
                "rsaref" => 0,
1018
1030
                "gcc" => \$gcc,
1019
1031
                "debug" => \$debug,