aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hcrypto
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2011-10-08 04:08:44 +0000
committerStanislav Sedov <stas@FreeBSD.org>2011-10-08 04:08:44 +0000
commit813b7899c1cf9c5cd1b72c0fb7c6c740aab26929 (patch)
tree353454e541452788c2b3c59d1fb19ada4daf5646 /lib/hcrypto
parent7c450da7b446c557e05f34a100b597800967d987 (diff)
downloadsrc-813b7899c1cf9c5cd1b72c0fb7c6c740aab26929.tar.gz
src-813b7899c1cf9c5cd1b72c0fb7c6c740aab26929.zip
- Update vendor tree of heimdal to 1.5.1.vendor/heimdal/1.5.1
Notes
Notes: svn path=/vendor-crypto/heimdal/dist/; revision=226128 svn path=/vendor-crypto/heimdal/1.5.1/; revision=226129; tag=vendor/heimdal/1.5.1
Diffstat (limited to 'lib/hcrypto')
-rw-r--r--lib/hcrypto/test_crypto.in5
-rw-r--r--lib/hcrypto/validate.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/hcrypto/test_crypto.in b/lib/hcrypto/test_crypto.in
index 06505bfe8e07..f24ef266e0fe 100644
--- a/lib/hcrypto/test_crypto.in
+++ b/lib/hcrypto/test_crypto.in
@@ -78,7 +78,8 @@ for a in unix fortuna egd w32crypto ;do
echo "random metod $a out for dinner"
continue
fi
- cmp crypto-test crypto-test2 && { echo "rand output same!" ; exit 1; }
+ cmp crypto-test crypto-test2 >/dev/null 2>/dev/null && \
+ { echo "rand output same!" ; exit 1; }
done
./example_evp_cipher 1 ${srcdir}/test_crypto.in test-out-1 || \
@@ -94,7 +95,7 @@ done
# RAND_file_name() when the enviroment is lacking those.
#
-if [ -e /dev/random -o -e /dev/urandom -o -e /dev/srandom -o -e /dev/arandom ] ; then
+if [ -r /dev/random -o -r /dev/urandom -o -r /dev/srandom -o -r /dev/arandom ] ; then
# try hard to unset HOME and RANDFILE
HOME=
diff --git a/lib/hcrypto/validate.c b/lib/hcrypto/validate.c
index 48b9bfc6e352..6f61cc53b307 100644
--- a/lib/hcrypto/validate.c
+++ b/lib/hcrypto/validate.c
@@ -56,7 +56,7 @@ struct tests {
void *outiv;
};
-struct tests tests[] = {
+static struct tests hc_tests[] = {
{
EVP_aes_256_cbc,
"aes-256",
@@ -300,8 +300,8 @@ hcrypto_validate(void)
return;
validated++;
- for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
- test_cipher(&tests[i]);
+ for (i = 0; i < sizeof(hc_tests) / sizeof(hc_tests[0]); i++)
+ test_cipher(&hc_tests[i]);
check_hmac();
}