Recent changes from 0.9.7-stable
Since we have changed from using Makefile instead of Makefile.ssl, we need to complete the work by changing all references. make update
This commit is contained in:
Richard Levitte
parent
48e1c0c012
commit
8797be2dce
2
FAQ
2
FAQ
@ -460,7 +460,7 @@ get the best result from OpenSSL. A bit more complicated solution is the
|
||||
following:
|
||||
|
||||
----- snip:start -----
|
||||
make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
|
||||
make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile | \
|
||||
sed -e 's/ -O[0-9] / -O0 /'`"
|
||||
rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
|
||||
make
|
||||
|
||||
4
INSTALL
4
INSTALL
@ -123,7 +123,7 @@
|
||||
generic configurations "cc" or "gcc" should usually work on 32 bit
|
||||
systems.
|
||||
|
||||
Configure creates the file Makefile.ssl from Makefile.org and
|
||||
Configure creates the file Makefile from Makefile.org and
|
||||
defines various macros in crypto/opensslconf.h (generated from
|
||||
crypto/opensslconf.h.in).
|
||||
|
||||
@ -159,7 +159,7 @@
|
||||
the failure that isn't a problem in OpenSSL itself (like a missing
|
||||
or malfunctioning bc). If it is a problem with OpenSSL itself,
|
||||
try removing any compiler optimization flags from the CFLAG line
|
||||
in Makefile.ssl and run "make clean; make". Please send a bug
|
||||
in Makefile and run "make clean; make". Please send a bug
|
||||
report to <openssl-bugs@openssl.org>, including the output of
|
||||
"make report" in order to be added to the request tracker at
|
||||
http://www.openssl.org/support/rt2.html.
|
||||
|
||||
4
PROBLEMS
4
PROBLEMS
@ -12,8 +12,8 @@ along the whole library path before it bothers looking for .a libraries. This
|
||||
means that -L switches won't matter unless OpenSSL is built with shared
|
||||
library support.
|
||||
|
||||
The workaround may be to change the following lines in apps/Makefile.ssl and
|
||||
test/Makefile.ssl:
|
||||
The workaround may be to change the following lines in apps/Makefile and
|
||||
test/Makefile:
|
||||
|
||||
LIBCRYPTO=-L.. -lcrypto
|
||||
LIBSSL=-L.. -lssl
|
||||
|
||||
@ -636,24 +636,25 @@ openssl.o: ../include/openssl/des.h ../include/openssl/des_old.h
|
||||
openssl.o: ../include/openssl/dh.h ../include/openssl/dsa.h
|
||||
openssl.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
|
||||
openssl.o: ../include/openssl/err.h ../include/openssl/evp.h
|
||||
openssl.o: ../include/openssl/idea.h ../include/openssl/kssl.h
|
||||
openssl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
|
||||
openssl.o: ../include/openssl/md4.h ../include/openssl/md5.h
|
||||
openssl.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
|
||||
openssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
|
||||
openssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
|
||||
openssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
|
||||
openssl.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
|
||||
openssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
|
||||
openssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
|
||||
openssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
|
||||
openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
|
||||
openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
|
||||
openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
|
||||
openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
|
||||
openssl.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
|
||||
openssl.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
|
||||
openssl.o: ../include/openssl/x509_vfy.h apps.h openssl.c progs.h s_apps.h
|
||||
openssl.o: ../include/openssl/fips.h ../include/openssl/idea.h
|
||||
openssl.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
|
||||
openssl.o: ../include/openssl/md2.h ../include/openssl/md4.h
|
||||
openssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
|
||||
openssl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
|
||||
openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
|
||||
openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
|
||||
openssl.o: ../include/openssl/rand.h ../include/openssl/rc2.h
|
||||
openssl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
|
||||
openssl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
|
||||
openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
|
||||
openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
|
||||
openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
|
||||
openssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
|
||||
openssl.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
|
||||
openssl.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
|
||||
openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
|
||||
openssl.o: openssl.c progs.h s_apps.h
|
||||
passwd.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
|
||||
passwd.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
|
||||
passwd.o: ../include/openssl/bn.h ../include/openssl/buffer.h
|
||||
|
||||
81
apps/apps.c
81
apps/apps.c
@ -330,41 +330,19 @@ void program_name(char *in, char *out, int size)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_SYS_WIN32
|
||||
int WIN32_rename(char *from, char *to)
|
||||
#ifdef OPENSSL_SYS_VMS
|
||||
int VMS_strcasecmp(const char *str1, const char *str2)
|
||||
{
|
||||
#ifndef OPENSSL_SYS_WINCE
|
||||
/* Windows rename gives an error if 'to' exists, so delete it
|
||||
* first and ignore file not found errror
|
||||
*/
|
||||
if((remove(to) != 0) && (errno != ENOENT))
|
||||
return -1;
|
||||
#undef rename
|
||||
return rename(from, to);
|
||||
#else
|
||||
/* convert strings to UNICODE */
|
||||
{
|
||||
BOOL result = FALSE;
|
||||
WCHAR* wfrom;
|
||||
WCHAR* wto;
|
||||
int i;
|
||||
wfrom = malloc((strlen(from)+1)*2);
|
||||
wto = malloc((strlen(to)+1)*2);
|
||||
if (wfrom != NULL && wto != NULL)
|
||||
while (*str1 && *str2)
|
||||
{
|
||||
for (i=0; i<(int)strlen(from)+1; i++)
|
||||
wfrom[i] = (short)from[i];
|
||||
for (i=0; i<(int)strlen(to)+1; i++)
|
||||
wto[i] = (short)to[i];
|
||||
result = MoveFile(wfrom, wto);
|
||||
int res = toupper(*str1) - toupper(*str2);
|
||||
if (res) return res < 0 ? -1 : 1;
|
||||
}
|
||||
if (wfrom != NULL)
|
||||
free(wfrom);
|
||||
if (wto != NULL)
|
||||
free(wto);
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
if (*str1)
|
||||
return 1;
|
||||
if (*str2)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1950,3 +1928,42 @@ void free_index(CA_DB *db)
|
||||
OPENSSL_free(db);
|
||||
}
|
||||
}
|
||||
|
||||
/* This code MUST COME AFTER anything that uses rename() */
|
||||
#ifdef OPENSSL_SYS_WIN32
|
||||
int WIN32_rename(char *from, char *to)
|
||||
{
|
||||
#ifndef OPENSSL_SYS_WINCE
|
||||
/* Windows rename gives an error if 'to' exists, so delete it
|
||||
* first and ignore file not found errror
|
||||
*/
|
||||
if((remove(to) != 0) && (errno != ENOENT))
|
||||
return -1;
|
||||
#undef rename
|
||||
return rename(from, to);
|
||||
#else
|
||||
/* convert strings to UNICODE */
|
||||
{
|
||||
BOOL result = FALSE;
|
||||
WCHAR* wfrom;
|
||||
WCHAR* wto;
|
||||
int i;
|
||||
wfrom = malloc((strlen(from)+1)*2);
|
||||
wto = malloc((strlen(to)+1)*2);
|
||||
if (wfrom != NULL && wto != NULL)
|
||||
{
|
||||
for (i=0; i<(int)strlen(from)+1; i++)
|
||||
wfrom[i] = (short)from[i];
|
||||
for (i=0; i<(int)strlen(to)+1; i++)
|
||||
wto[i] = (short)to[i];
|
||||
result = MoveFile(wfrom, wto);
|
||||
}
|
||||
if (wfrom != NULL)
|
||||
free(wfrom);
|
||||
if (wto != NULL)
|
||||
free(wto);
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -214,13 +214,14 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
b->ptr=(char *)ptr;
|
||||
b->init=1;
|
||||
{
|
||||
int fd = fileno((FILE*)ptr);
|
||||
#if defined(OPENSSL_SYS_WINDOWS)
|
||||
int fd = fileno((FILE*)ptr);
|
||||
if (num & BIO_FP_TEXT)
|
||||
_setmode(fd,_O_TEXT);
|
||||
else
|
||||
_setmode(fd,_O_BINARY);
|
||||
#elif defined(OPENSSL_SYS_MSDOS)
|
||||
int fd = fileno((FILE*)ptr);
|
||||
/* Set correct text/binary mode */
|
||||
if (num & BIO_FP_TEXT)
|
||||
_setmode(fd,_O_TEXT);
|
||||
@ -236,6 +237,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
_setmode(fd,_O_BINARY);
|
||||
}
|
||||
#elif defined(OPENSSL_SYS_OS2)
|
||||
int fd = fileno((FILE*)ptr);
|
||||
if (num & BIO_FP_TEXT)
|
||||
setmode(fd, O_TEXT);
|
||||
else
|
||||
|
||||
@ -232,7 +232,7 @@ int main(int argc, char *argv[])
|
||||
EXIT(0);
|
||||
err:
|
||||
BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
|
||||
* the failure, see test_bn in test/Makefile.ssl*/
|
||||
* the failure, see test_bn in test/Makefile */
|
||||
BIO_flush(out);
|
||||
ERR_load_crypto_strings();
|
||||
ERR_print_errors_fp(stderr);
|
||||
|
||||
@ -8,7 +8,7 @@ README - What this package is.
|
||||
VERSION - Which version this is and what was changed.
|
||||
KERBEROS - Kerberos version 4 notes.
|
||||
Makefile.PL - An old makefile to build with perl5, not current.
|
||||
Makefile.ssl - The SSLeay makefile
|
||||
Makefile - The SSLeay makefile
|
||||
Makefile.uni - The normal unix makefile.
|
||||
GNUmakefile - The makefile for use with glibc.
|
||||
makefile.bc - A Borland C makefile
|
||||
|
||||
@ -166,6 +166,7 @@ int RAND_write_file(const char *file)
|
||||
}
|
||||
|
||||
#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
|
||||
{
|
||||
/* For some reason Win32 can't write to files created this way */
|
||||
|
||||
/* chmod(..., 0600) is too late to protect the file,
|
||||
@ -173,6 +174,7 @@ int RAND_write_file(const char *file)
|
||||
int fd = open(file, O_CREAT, 0600);
|
||||
if (fd != -1)
|
||||
out = fdopen(fd, "wb");
|
||||
}
|
||||
#endif
|
||||
if (out == NULL)
|
||||
out = fopen(file,"wb");
|
||||
|
||||
@ -47,9 +47,10 @@ Encrypting user data directly with RSA is insecure.
|
||||
=back
|
||||
|
||||
B<flen> must be less than RSA_size(B<rsa>) - 11 for the PKCS #1 v1.5
|
||||
based padding modes, and less than RSA_size(B<rsa>) - 41 for
|
||||
RSA_PKCS1_OAEP_PADDING. The random number generator must be seeded
|
||||
prior to calling RSA_public_encrypt().
|
||||
based padding modes, less than RSA_size(B<rsa>) - 41 for
|
||||
RSA_PKCS1_OAEP_PADDING and exactly RSA_size(B<rsa>) for RSA_NO_PADDING.
|
||||
The random number generator must be seeded prior to calling
|
||||
RSA_public_encrypt().
|
||||
|
||||
RSA_private_decrypt() decrypts the B<flen> bytes at B<from> using the
|
||||
private key B<rsa> and stores the plaintext in B<to>. B<to> must point
|
||||
|
||||
@ -90,10 +90,11 @@ fips_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
|
||||
fips_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
fips_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
fips_rand.o: fips_rand.c
|
||||
fips_randtest.o: ../../e_os.h ../../include/openssl/crypto.h
|
||||
fips_randtest.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
fips_randtest.o: ../../include/openssl/e_os2.h
|
||||
fips_randtest.o: ../../include/openssl/fips_rand.h
|
||||
fips_randtest.o: ../../e_os.h ../../include/openssl/bio.h
|
||||
fips_randtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
fips_randtest.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
fips_randtest.o: ../../include/openssl/err.h ../../include/openssl/fips_rand.h
|
||||
fips_randtest.o: ../../include/openssl/lhash.h
|
||||
fips_randtest.o: ../../include/openssl/opensslconf.h
|
||||
fips_randtest.o: ../../include/openssl/opensslv.h
|
||||
fips_randtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
|
||||
|
||||
@ -74,9 +74,9 @@ make clean
|
||||
|
||||
# Hack the Makefiles to pick up the dynamic libraries during linking
|
||||
#
|
||||
sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile.ssl >xxx; mv xxx Makefile.ssl
|
||||
sed 's/-L\.\.//' apps/Makefile.ssl >xxx; mv xxx apps/Makefile.ssl
|
||||
sed 's/-L\.\.//' test/Makefile.ssl >xxx; mv xxx test/Makefile.ssl
|
||||
sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile >xxx; mv xxx Makefile.ssl
|
||||
sed 's/-L\.\.//' apps/Makefile >xxx; mv xxx apps/Makefile
|
||||
sed 's/-L\.\.//' test/Makefile >xxx; mv xxx test/Makefile
|
||||
# Build the static libs and the executables in one make.
|
||||
make
|
||||
# Install everything
|
||||
|
||||
@ -741,9 +741,10 @@ fips_dsatest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
|
||||
fips_dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
|
||||
fips_dsatest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
|
||||
fips_dsatest.o: fips_dsatest.c
|
||||
fips_randtest.o: ../e_os.h ../include/openssl/crypto.h ../include/openssl/des.h
|
||||
fips_randtest.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
|
||||
fips_randtest.o: ../include/openssl/fips_rand.h
|
||||
fips_randtest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h
|
||||
fips_randtest.o: ../include/openssl/des.h ../include/openssl/des_old.h
|
||||
fips_randtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
|
||||
fips_randtest.o: ../include/openssl/fips_rand.h ../include/openssl/lhash.h
|
||||
fips_randtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
fips_randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
|
||||
fips_randtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This script is used by test/Makefile.ssl to check whether a sane 'bc'
|
||||
# This script is used by test/Makefile to check whether a sane 'bc'
|
||||
# is installed.
|
||||
# ('make test_bn' should not try to run 'bc' if it does not exist or if
|
||||
# it is a broken 'bc' version that is known to cause trouble.)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
testsrc=Makefile.ssl
|
||||
testsrc=Makefile
|
||||
test=./p
|
||||
cmd=../apps/openssl
|
||||
|
||||
|
||||
@ -21,11 +21,11 @@ function cleanup()
|
||||
|
||||
function get_openssl_version()
|
||||
{
|
||||
eval `grep '^VERSION=' Makefile.ssl`
|
||||
eval `grep '^VERSION=' Makefile`
|
||||
if [ -z "${VERSION}" ]
|
||||
then
|
||||
echo "Error: Couldn't retrieve OpenSSL version from Makefile.ssl."
|
||||
echo " Check value of variable VERSION in Makefile.ssl."
|
||||
echo "Error: Couldn't retrieve OpenSSL version from Makefile."
|
||||
echo " Check value of variable VERSION in Makefile."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
10
util/domd
10
util/domd
@ -11,7 +11,7 @@ if [ "$1" = "-MD" ]; then
|
||||
fi
|
||||
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
|
||||
|
||||
cp Makefile.ssl Makefile.save
|
||||
cp Makefile Makefile.save
|
||||
# fake the presence of Kerberos
|
||||
touch $TOP/krb5.h
|
||||
if [ "$MAKEDEPEND" = "gcc" ]; then
|
||||
@ -20,15 +20,15 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
|
||||
if [ "$1" != "--" ]; then args="$args $1"; fi
|
||||
shift
|
||||
done
|
||||
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
|
||||
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
|
||||
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
|
||||
gcc -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
|
||||
${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
|
||||
rm -f Makefile.tmp
|
||||
else
|
||||
${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@
|
||||
${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
|
||||
${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile $@
|
||||
${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
|
||||
fi
|
||||
mv Makefile.new Makefile.ssl
|
||||
mv Makefile.new Makefile
|
||||
# unfake the presence of Kerberos
|
||||
rm $TOP/krb5.h
|
||||
|
||||
@ -9,9 +9,11 @@ while(<STDIN>) {
|
||||
} elsif ($name) {
|
||||
if (/ - /) {
|
||||
s/ - .*//;
|
||||
s/,[ \t]+/,/g;
|
||||
s/^[ \t]+//g;
|
||||
s/[ \t]+$//g;
|
||||
s/,\s+/,/g;
|
||||
s/\s+,/,/g;
|
||||
s/^\s+//g;
|
||||
s/\s+$//g;
|
||||
s/\s/_/g;
|
||||
push @words, split ',';
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
# clean up the mess that NT makes of my source tree
|
||||
#
|
||||
|
||||
if [ -f makefile.ssl -a ! -f Makefile.ssl ]; then
|
||||
/bin/mv makefile.ssl Makefile.ssl
|
||||
if [ -f makefile -a ! -f Makefile ]; then
|
||||
/bin/mv makefile Makefile
|
||||
fi
|
||||
chmod +x Configure util/*
|
||||
echo cleaning
|
||||
/bin/rm -f `find . -name '*.$$$' -print` 2>/dev/null >/dev/null
|
||||
echo 'removing those damn ^M'
|
||||
perl -pi -e 's/\015//' `find . -type 'f' -print |grep -v '.obj$' |grep -v '.der$' |grep -v '.gz'`
|
||||
make -f Makefile.ssl links
|
||||
make -f Makefile links
|
||||
|
||||
@ -10,7 +10,7 @@ $OPTIONS="";
|
||||
$ssl_version="";
|
||||
$banner="\t\@echo Building OpenSSL";
|
||||
|
||||
open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
|
||||
open(IN,"<Makefile") || die "unable to open Makefile!\n";
|
||||
while(<IN>) {
|
||||
$ssl_version=$1 if (/^VERSION=(.*)$/);
|
||||
$OPTIONS=$1 if (/^OPTIONS=(.*)$/);
|
||||
@ -18,7 +18,7 @@ while(<IN>) {
|
||||
}
|
||||
close(IN);
|
||||
|
||||
die "Makefile.ssl is not the toplevel Makefile!\n" if $ssl_version eq "";
|
||||
die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
|
||||
|
||||
$infile="MINFO";
|
||||
|
||||
@ -640,7 +640,7 @@ if ($platform eq "linux-elf") {
|
||||
print <<"EOF";
|
||||
# Generate perlasm output files
|
||||
%.cpp:
|
||||
(cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F))
|
||||
(cd \$(\@D)/..; PERL=perl make -f Makefile asm/\$(\@F))
|
||||
EOF
|
||||
}
|
||||
print "###################################################################\n";
|
||||
|
||||
@ -94,7 +94,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
|
||||
"FP_API", "STDIO", "SOCK", "KRB5", "ENGINE", "HW" );
|
||||
|
||||
my $options="";
|
||||
open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
|
||||
open(IN,"<Makefile") || die "unable to open Makefile!\n";
|
||||
while(<IN>) {
|
||||
$options=$1 if (/^OPTIONS=(.*)$/);
|
||||
}
|
||||
@ -1119,7 +1119,7 @@ sub print_test_file
|
||||
sub get_version {
|
||||
local *MF;
|
||||
my $v = '?';
|
||||
open MF, 'Makefile.ssl' or return $v;
|
||||
open MF, 'Makefile' or return $v;
|
||||
while (<MF>) {
|
||||
$v = $1, last if /^VERSION=(.*?)\s*$/;
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ my @dirs = (
|
||||
);
|
||||
|
||||
foreach (@dirs) {
|
||||
&files_dir ($_, "Makefile.ssl");
|
||||
&files_dir ($_, "Makefile");
|
||||
}
|
||||
|
||||
exit(0);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This script is used by test/Makefile.ssl to check whether a sane 'pod2man'
|
||||
# This script is used by test/Makefile to check whether a sane 'pod2man'
|
||||
# is installed.
|
||||
# ('make install' should not try to run 'pod2man' if it does not exist or if
|
||||
# it is a broken 'pod2man' version that is known to cause trouble. if we find
|
||||
|
||||
@ -34,9 +34,9 @@ foreach $_ (split("\n",$c)) {
|
||||
$platform0=$1 if (/Configuring for (.*)$/);
|
||||
}
|
||||
|
||||
system "sh config" if (! -f "Makefile.ssl");
|
||||
system "sh config" if (! -f "Makefile");
|
||||
|
||||
if (open(IN,"<Makefile.ssl")) {
|
||||
if (open(IN,"<Makefile")) {
|
||||
while (<IN>) {
|
||||
$version=$1 if (/^VERSION=(.*)$/);
|
||||
$platform=$1 if (/^PLATFORM=(.*)$/);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user