diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/libeay.num | 143 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 16 | ||||
| -rwxr-xr-x | util/mkdef.pl | 30 | ||||
| -rw-r--r-- | util/mkerr.pl | 28 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 1 | ||||
| -rw-r--r-- | util/pl/BC-32.pl | 2 | ||||
| -rw-r--r-- | util/pl/Mingw32.pl | 25 | ||||
| -rw-r--r-- | util/pl/linux.pl | 2 | ||||
| -rw-r--r-- | util/selftest.pl | 20 | ||||
| -rwxr-xr-x | util/sep_lib.sh | 34 |
10 files changed, 53 insertions, 248 deletions
diff --git a/util/libeay.num b/util/libeay.num index 03c8ee21e19..e3818ef6e4b 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2227,146 +2227,3 @@ BIO_callback_ctrl 2252 RAND_egd 2253 RAND_status 2254 bn_dump1 2255 -des_check_key_parity 2256 -lh_num_items 2257 -RAND_event 2258 -DSO_new 2259 -DSO_new_method 2260 -DSO_free 2261 -DSO_flags 2262 -DSO_up 2263 -DSO_set_default_method 2264 -DSO_get_default_method 2265 -DSO_get_method 2266 -DSO_set_method 2267 -DSO_load 2268 -DSO_bind 2269 -DSO_METHOD_null 2270 -DSO_METHOD_openssl 2271 -DSO_METHOD_dlfcn 2272 -DSO_METHOD_win32 2273 -ERR_load_DSO_strings 2274 -DSO_METHOD_dl 2275 -NCONF_load 2276 -CONF_dump 2277 -NCONF_load_fp 2278 -NCONF_new 2279 -NCONF_get_string 2280 -NCONF_free 2281 -NCONF_get_number 2282 -CONF_dump_fp 2283 -NCONF_load_bio 2284 -NCONF_dump_fp 2285 -NCONF_get_section 2286 -NCONF_dump_bio 2287 -CONF_dump_bio 2288 -NCONF_free_data 2289 -CONF_set_default_method 2290 -ERR_error_string_n 2291 -BIO_snprintf 2292 -DSO_ctrl 2293 -sk_PKCS7_num 2294 -sk_PKCS12_SAFEBAG_set 2295 -sk_BIO_delete 2296 -sk_PKCS7_new_null 2297 -sk_BIO_delete_ptr 2298 -sk_ASN1_INTEGER_dup 2299 -sk_BIO_value 2300 -sk_PKCS7_delete_ptr 2301 -sk_X509V3_EXT_METHOD_pop 2302 -sk_PKCS12_SAFEBAG_new_null 2303 -sk_ASN1_INTEGER_delete 2304 -sk_BIO_sort 2305 -sk_ASN1_INTEGER_sort 2306 -sk_PKCS7_free 2307 -sk_PKCS12_SAFEBAG_dup 2308 -sk_X509V3_EXT_METHOD_sort 2309 -sk_X509V3_EXT_METHOD_pop_free 2310 -sk_X509V3_EXT_METHOD_shift 2311 -sk_ASN1_INTEGER_pop_free 2312 -sk_X509V3_EXT_METHOD_unshift 2313 -sk_ASN1_INTEGER_pop 2314 -sk_BIO_new_null 2315 -sk_PKCS7_set 2316 -i2d_ASN1_SET_OF_ASN1_INTEGER 2317 -sk_PKCS12_SAFEBAG_push 2318 -sk_X509V3_EXT_METHOD_value 2319 -i2d_ASN1_SET_OF_PKCS12_SAFEBAG 2320 -sk_PKCS7_zero 2321 -sk_ASN1_INTEGER_shift 2322 -sk_PKCS12_SAFEBAG_insert 2323 -sk_PKCS12_SAFEBAG_find 2324 -sk_PKCS12_SAFEBAG_unshift 2325 -sk_ASN1_INTEGER_unshift 2326 -sk_PKCS12_SAFEBAG_pop 2327 -i2d_ASN1_SET_OF_PKCS7 2328 -sk_ASN1_INTEGER_delete_ptr 2329 -sk_PKCS7_dup 2330 -sk_BIO_new 2331 -sk_ASN1_INTEGER_value 2332 -sk_PKCS12_SAFEBAG_delete 2333 -BIO_vfree 2334 -sk_X509V3_EXT_METHOD_new_null 2335 -sk_BIO_push 2336 -sk_ASN1_INTEGER_new_null 2337 -sk_PKCS12_SAFEBAG_set_cmp_func 2338 -d2i_ASN1_SET_OF_ASN1_INTEGER 2339 -sk_ASN1_INTEGER_push 2340 -d2i_ASN1_SET_OF_PKCS12_SAFEBAG 2341 -sk_BIO_find 2342 -sk_X509V3_EXT_METHOD_push 2343 -sk_BIO_set_cmp_func 2344 -sk_ASN1_INTEGER_find 2345 -sk_X509V3_EXT_METHOD_find 2346 -sk_PKCS12_SAFEBAG_delete_ptr 2347 -sk_X509V3_EXT_METHOD_new 2348 -sk_BIO_num 2349 -ASN1_UTCTIME_get 2350 -sk_PKCS7_pop 2351 -sk_PKCS7_insert 2352 -sk_PKCS7_sort 2353 -sk_X509V3_EXT_METHOD_insert 2354 -sk_ASN1_INTEGER_new 2355 -sk_PKCS12_SAFEBAG_free 2356 -sk_X509V3_EXT_METHOD_num 2357 -sk_PKCS7_delete 2358 -sk_X509V3_EXT_METHOD_delete 2359 -sk_BIO_set 2360 -sk_PKCS12_SAFEBAG_new 2361 -X509_REQ_digest 2362 -sk_ASN1_INTEGER_num 2363 -sk_PKCS7_set_cmp_func 2364 -sk_PKCS7_shift 2365 -sk_PKCS12_SAFEBAG_zero 2366 -sk_BIO_free 2367 -sk_ASN1_INTEGER_free 2368 -sk_X509V3_EXT_METHOD_set_cmp_func 2369 -sk_PKCS7_push 2370 -sk_X509V3_EXT_METHOD_free 2371 -sk_PKCS7_pop_free 2372 -sk_PKCS7_value 2373 -sk_X509V3_EXT_METHOD_delete_ptr 2374 -sk_X509V3_EXT_METHOD_set 2375 -sk_PKCS12_SAFEBAG_num 2376 -sk_PKCS7_find 2377 -sk_ASN1_INTEGER_set_cmp_func 2378 -sk_PKCS12_SAFEBAG_shift 2379 -sk_BIO_dup 2380 -sk_PKCS7_unshift 2381 -sk_PKCS12_SAFEBAG_pop_free 2382 -sk_BIO_zero 2383 -sk_PKCS7_new 2384 -sk_ASN1_INTEGER_zero 2385 -sk_BIO_unshift 2386 -sk_ASN1_INTEGER_set 2387 -sk_BIO_insert 2388 -sk_X509V3_EXT_METHOD_zero 2389 -sk_PKCS12_SAFEBAG_value 2390 -X509_CRL_digest 2391 -sk_X509V3_EXT_METHOD_dup 2392 -sk_BIO_shift 2393 -sk_PKCS12_SAFEBAG_sort 2394 -sk_BIO_pop 2395 -sk_BIO_pop_free 2396 -d2i_ASN1_SET_OF_PKCS7 2397 -sk_ASN1_INTEGER_insert 2398 diff --git a/util/mk1mf.pl b/util/mk1mf.pl index ffb3c108342..6fbf3ceca6a 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -8,7 +8,6 @@ $INSTALLTOP="/usr/local/ssl"; $OPTIONS=""; $ssl_version=""; -$banner="\t\@echo Building OpenSSL"; open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; while(<IN>) { @@ -60,7 +59,6 @@ and [options] can be one of just-ssl - remove all non-ssl keys/digest no-asm - No x86 asm nasm - Use NASM for x86 asm - gaswin - Use GNU as with Mingw32 no-socks - No socket code no-err - No error strings dll/shlib - Build shared libraries (MS) @@ -273,8 +271,6 @@ LFLAGS=$lflags BN_ASM_OBJ=$bn_asm_obj BN_ASM_SRC=$bn_asm_src -BNCO_ASM_OBJ=$bnco_asm_obj -BNCO_ASM_SRC=$bnco_asm_src DES_ENC_OBJ=$des_enc_obj DES_ENC_SRC=$des_enc_src BF_ENC_OBJ=$bf_enc_obj @@ -362,10 +358,6 @@ all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe banner: $banner -# Generate perlasm output files -%.cpp: - (cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F)) - \$(TMP_D): \$(MKDIR) \$(TMP_D) # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different @@ -385,7 +377,6 @@ $banner \$(MKDIR) \$(INC_D) headers: \$(HEADER) \$(EXHEADER) - @ lib: \$(LIBS_DEP) @@ -546,11 +537,6 @@ foreach (values %lib_nam) $lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/; $rules.=&do_asm_rule($bn_asm_obj,$bn_asm_src); } - if (($bnco_asm_obj ne "") && ($_ eq "CRYPTO")) - { - $lib_obj .= "\$(BNCO_ASM_OBJ)"; - $rules.=&do_asm_rule($bnco_asm_obj,$bnco_asm_src); - } if (($des_enc_obj ne "") && ($_ eq "CRYPTO")) { $lib_obj =~ s/\s\S*des_enc\S*/ \$(DES_ENC_OBJ)/; @@ -729,7 +715,6 @@ sub do_defs { $pf=".c"; } else { $pf=$postfix; } if ($_ =~ /BN_ASM/) { $t="$_ "; } - elsif ($_ =~ /BNCO_ASM/){ $t="$_ "; } elsif ($_ =~ /DES_ENC/) { $t="$_ "; } elsif ($_ =~ /BF_ENC/) { $t="$_ "; } elsif ($_ =~ /CAST_ENC/){ $t="$_ "; } @@ -865,7 +850,6 @@ sub read_options elsif (/^no-hmac$/) { $no_hmac=1; } elsif (/^no-asm$/) { $no_asm=1; } elsif (/^nasm$/) { $nasm=1; } - elsif (/^gaswin$/) { $gaswin=1; } elsif (/^no-ssl2$/) { $no_ssl2=1; } elsif (/^no-ssl3$/) { $no_ssl3=1; } elsif (/^no-err$/) { $no_err=1; } diff --git a/util/mkdef.pl b/util/mkdef.pl index 9f5fba91467..4e2845a4e19 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -105,7 +105,6 @@ $crypto.=" crypto/hmac/hmac.h" unless $no_hmac; $crypto.=" crypto/stack/stack.h"; $crypto.=" crypto/buffer/buffer.h"; $crypto.=" crypto/bio/bio.h"; -$crypto.=" crypto/dso/dso.h"; $crypto.=" crypto/lhash/lhash.h"; $crypto.=" crypto/conf/conf.h"; $crypto.=" crypto/txt_db/txt_db.h"; @@ -296,26 +295,18 @@ sub do_defs $funcs{"i2d_ASN1_SET_OF_${1}"} = 1; } elsif (/^DECLARE_PEM_rw\s*\(\s*(\w*)\s*,/ || /^DECLARE_PEM_rw_cb\s*\(\s*(\w*)\s*,/ ) { - if (!($no_rsa && ($1 eq "RSAPrivateKey" || - $1 eq "RSAPublicKey" || - $1 eq "RSA_PUBKEY"))) { - if($W32) { - $funcs{"PEM_read_${1}"} = 1; - $funcs{"PEM_write_${1}"} = 1; - } - $funcs{"PEM_read_bio_${1}"} = 1; - $funcs{"PEM_write_bio_${1}"} = 1; + if($W32) { + $funcs{"PEM_read_${1}"} = 1; + $funcs{"PEM_write_${1}"} = 1; } + $funcs{"PEM_read_bio_${1}"} = 1; + $funcs{"PEM_write_bio_${1}"} = 1; } elsif (/^DECLARE_PEM_write\s*\(\s*(\w*)\s*,/ || /^DECLARE_PEM_write_cb\s*\(\s*(\w*)\s*,/ ) { - if (!($no_rsa && ($1 eq "RSAPrivateKey" || - $1 eq "RSAPublicKey" || - $1 eq "RSA_PUBKEY"))) { - if($W32) { - $funcs{"PEM_write_${1}"} = 1; - } - $funcs{"PEM_write_bio_${1}"} = 1; + if($W32) { + $funcs{"PEM_write_${1}"} = 1; } + $funcs{"PEM_write_bio_${1}"} = 1; } elsif (/^DECLARE_PEM_read\s*\(\s*(\w*)\s*,/ || /^DECLARE_PEM_read_cb\s*\(\s*(\w*)\s*,/ ) { if($W32) { @@ -376,11 +367,6 @@ sub do_defs next if(/EVP_rc5/ and $no_rc5); next if(/EVP_ripemd/ and $no_ripemd); next if(/EVP_sha/ and $no_sha); - next if(/EVP_(Open|Seal)(Final|Init)/ and $no_rsa); - next if(/PEM_Seal(Final|Init|Update)/ and $no_rsa); - next if(/RSAPrivateKey/ and $no_rsa); - next if(/SSLv23?_((client|server)_)?method/ and $no_rsa); - if (/\(\*(\w*)\([^\)]+/) { $funcs{$1} = 1; } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s) { diff --git a/util/mkerr.pl b/util/mkerr.pl index 5f094a50826..ebc059ef228 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -38,7 +38,7 @@ while (@ARGV) { } if($recurse) { - @source = (<crypto/*.c>, <crypto/*/*.c>, <rsaref/*.c>, <ssl/*.c>); + @source = (<crypto/*.c>, <crypto/*/*.c>, ,<rsaref/*.c>, <ssl/*.c>); } else { @source = @ARGV; } @@ -284,17 +284,6 @@ EOF # Rewrite the C source file containing the error details. - # First, read any existing reason string definitions: - my %err_reason_strings; - if (open(IN,"<$cfile")) { - while (<IN>) { - if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { - $err_reason_strings{$1} = $2; - } - } - close(IN); - } - my $hincf; if($static) { $hfile =~ /([^\/]+)$/; @@ -363,8 +352,7 @@ EOF */ /* NOTE: this file was auto generated by the mkerr.pl script: any changes - * made to it will be overwritten when the script next updates this file, - * only reason strings will be preserved. + * made to it will be overwritten when the script next updates this file. */ #include <stdio.h> @@ -397,13 +385,9 @@ EOF foreach $i (@reasons) { my $rn; my $nspc = 0; - if (exists $err_reason_strings{$i}) { - $rn = $err_reason_strings{$i}; - } else { - $i =~ /^${lib}_R_(\S+)$/; - $rn = $1; - $rn =~ tr/_[A-Z]/ [a-z]/; - } + $i =~ /^${lib}_R_(\S+)$/; + $rn = $1; + $rn =~ tr/_[A-Z]/ [a-z]/; $nspc = 40 - length($i) unless length($i) > 40; $nspc = " " x $nspc; print OUT "{${i}${nspc},\"$rn\"},\n"; @@ -481,7 +465,7 @@ EOF } close OUT; - undef %err_reason_strings; + } if($debug && defined(%notrans)) { diff --git a/util/mkfiles.pl b/util/mkfiles.pl index 924a85f70ea..6fa424bd190 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -25,7 +25,6 @@ my @dirs = ( "crypto/bn", "crypto/rsa", "crypto/dsa", -"crypto/dso", "crypto/dh", "crypto/buffer", "crypto/bio", diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index 7f57809a165..df6e2c742e4 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -109,7 +109,7 @@ sub do_lib_rule { # $ret.="\t\$(RM) \$(O_$Name)\n"; $ret.="\techo LIB $<\n"; - $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; + $ret.="\t\$(MKLIB) $lfile$target \$(addprefix +, $objs)\n"; } else { diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl index c687d9b1185..585cacd8203 100644 --- a/util/pl/Mingw32.pl +++ b/util/pl/Mingw32.pl @@ -21,30 +21,6 @@ if ($debug) else { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } -if ($gaswin and !$no_asm) - { - $bn_asm_obj='$(OBJ_D)/bn-win32.o'; - $bn_asm_src='crypto/bn/asm/bn-win32.s'; - $des_enc_obj='$(OBJ_D)/d-win32.o $(OBJ_D)/y-win32.o'; - $des_enc_src='crypto/des/asm/d-win32.s crypto/des/asm/y-win32.s'; - $bf_enc_obj='$(OBJ_D)/b-win32.o'; - $bf_enc_src='crypto/bf/asm/b-win32.s'; -# $cast_enc_obj='$(OBJ_D)/c-win32.o'; -# $cast_enc_src='crypto/cast/asm/c-win32.s'; - $rc4_enc_obj='$(OBJ_D)/r4-win32.o'; - $rc4_enc_src='crypto/rc4/asm/r4-win32.s'; - $rc5_enc_obj='$(OBJ_D)/r5-win32.o'; - $rc5_enc_src='crypto/rc5/asm/r5-win32.s'; - $md5_asm_obj='$(OBJ_D)/m5-win32.o'; - $md5_asm_src='crypto/md5/asm/m5-win32.s'; - $rmd160_asm_obj='$(OBJ_D)/rm-win32.o'; - $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; - $sha1_asm_obj='$(OBJ_D)/s1-win32.o'; - $sha1_asm_src='crypto/sha/asm/s1-win32.s'; - $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; - } - - $obj='.o'; $ofile='-o '; @@ -100,3 +76,4 @@ sub do_link_rule return($ret); } 1; + diff --git a/util/pl/linux.pl b/util/pl/linux.pl index 3e497553265..a8cfdc578ad 100644 --- a/util/pl/linux.pl +++ b/util/pl/linux.pl @@ -19,8 +19,6 @@ if (!$no_asm) { $bn_asm_obj='$(OBJ_D)/bn86-elf.o'; $bn_asm_src='crypto/bn/asm/bn86unix.cpp'; - $bnco_asm_obj='$(OBJ_D)/co86-elf.o'; - $bnco_asm_src='crypto/bn/asm/co86unix.cpp'; $des_enc_obj='$(OBJ_D)/dx86-elf.o $(OBJ_D)/yx86-elf.o'; $des_enc_src='crypto/des/asm/dx86unix.cpp crypto/des/asm/yx86unix.cpp'; $bf_enc_obj='$(OBJ_D)/bx86-elf.o'; diff --git a/util/selftest.pl b/util/selftest.pl index 04b4425d7ef..91e962a312c 100644 --- a/util/selftest.pl +++ b/util/selftest.pl @@ -25,7 +25,7 @@ open(OUT,">$report") or die; print OUT "OpenSSL self-test report:\n\n"; $uname=`uname -a`; -$uname="??\n" if $uname eq ""; +$uname="??" if $uname eq ""; $c=`sh config -t`; foreach $_ (split("\n",$c)) { @@ -83,11 +83,6 @@ if (open(TEST,">cctest.c")) { print OUT "Compiler doesn't work.\n"; goto err; } - system("ar r cctest.a /dev/null"); - if (not -f "cctest.a") { - print OUT "Check your archive tool (ar).\n"; - goto err; - } } else { print OUT "Can't create cctest.c\n"; } @@ -134,14 +129,14 @@ if (/no-/) } print "Running make test...\n"; -if (system("make test 2>&1 | tee maketest.log") > 255) +if (system("make test 2>&1 | tee make.log") > 255) { print OUT "make test failed!\n"; } else { $ok=1; } -if ($ok and open(IN,"<maketest.log")) { +if ($ok and open(IN,"<make.log")) { while (<IN>) { $ok=2 if /^platform: $platform/; } @@ -160,15 +155,6 @@ if ($ok != 2) { } else { print OUT "make.log not found!\n"; } - if (open(IN,"<maketest.log")) { - while (<IN>) { - print OUT; - } - close(IN); - print OUT $sep; - } else { - print OUT "maketest.log not found!\n"; - } } else { print OUT "Test passed.\n"; } diff --git a/util/sep_lib.sh b/util/sep_lib.sh new file mode 100755 index 00000000000..34c2c9f8ba9 --- /dev/null +++ b/util/sep_lib.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +cwd=`pwd` +/bin/rm -fr tmp/* + +cd crypto/des +make -f Makefile.uni tar +make -f Makefile.uni tar_lit +/bin/mv libdes.tgz $cwd/tmp +/bin/mv libdes-l.tgz $cwd/tmp +cd $cwd + +for name in md5 sha cast bf idea rc4 rc2 +do + echo doing $name + (cd crypto; tar cfh - $name)|(cd tmp; tar xf -) + cd tmp/$name + /bin/rm -f Makefile + /bin/rm -f Makefile.ssl + /bin/rm -f Makefile.ssl.orig + /bin/rm -f *.old + /bin/mv Makefile.uni Makefile + + if [ -d asm ]; then + mkdir asm/perlasm + cp $cwd/crypto/perlasm/*.pl asm/perlasm + fi + cd .. + tar cf - $name|gzip >$name.tgz +# /bin/rm -fr $name + cd $cwd +done + + |