diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2002-06-07 03:45:35 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2002-06-07 03:45:35 +0000 |
| commit | ff121e423efd3c611e74f00bc681230532d543d7 (patch) | |
| tree | b699b77cb7d8375af148ae64ef32410f3fa82e93 /lib/libcrypto/util | |
| parent | d638bbbd4d30397af50fadfd5f2bb4bb609f04f0 (diff) | |
Merge OpenSSL 0.9.7-stable-20020605,
correctly autogenerate obj_mac.h
Diffstat (limited to 'lib/libcrypto/util')
| -rw-r--r-- | lib/libcrypto/util/domd | 4 | ||||
| -rw-r--r-- | lib/libcrypto/util/libeay.num | 6 | ||||
| -rw-r--r-- | lib/libcrypto/util/mkerr.pl | 4 | ||||
| -rw-r--r-- | lib/libcrypto/util/pod2man.pl | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/lib/libcrypto/util/domd b/lib/libcrypto/util/domd index aa99cb05236..8cbe383c165 100644 --- a/lib/libcrypto/util/domd +++ b/lib/libcrypto/util/domd @@ -18,11 +18,11 @@ if [ "$MAKEDEPEND" = "gcc" ]; then sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp - perl $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new + ${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 + ${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new fi mv Makefile.new Makefile.ssl # unfake the presence of Kerberos diff --git a/lib/libcrypto/util/libeay.num b/lib/libcrypto/util/libeay.num index b74749e5de3..4845158158f 100644 --- a/lib/libcrypto/util/libeay.num +++ b/lib/libcrypto/util/libeay.num @@ -2774,3 +2774,9 @@ AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES ENGINE_load_4758cca 3218 EXIST::FUNCTION: _ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES +EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES +EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES +EVP_aes_128_cfb 3222 EXIST::FUNCTION:AES +EVP_aes_256_cfb 3223 EXIST::FUNCTION:AES +EVP_aes_128_ofb 3224 EXIST::FUNCTION:AES +EVP_aes_192_cfb 3225 EXIST::FUNCTION:AES diff --git a/lib/libcrypto/util/mkerr.pl b/lib/libcrypto/util/mkerr.pl index 6c2237d1423..4105047b217 100644 --- a/lib/libcrypto/util/mkerr.pl +++ b/lib/libcrypto/util/mkerr.pl @@ -262,7 +262,7 @@ foreach $lib (keys %csrc) } else { push @out, "/* ====================================================================\n", -" * Copyright (c) 2001 The OpenSSL Project. All rights reserved.\n", +" * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved.\n", " *\n", " * Redistribution and use in source and binary forms, with or without\n", " * modification, are permitted provided that the following conditions\n", @@ -404,7 +404,7 @@ EOF print OUT <<"EOF"; /* $cfile */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libcrypto/util/pod2man.pl b/lib/libcrypto/util/pod2man.pl index c6b64add602..657e4e264e0 100644 --- a/lib/libcrypto/util/pod2man.pl +++ b/lib/libcrypto/util/pod2man.pl @@ -416,8 +416,8 @@ if ($name ne 'something') { warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n" } else { - $n[0] =~ s/\n/ /; - $n[1] =~ s/\n/ /; + $n[0] =~ s/\n/ /g; + $n[1] =~ s/\n/ /g; %namedesc = @n; } } |