Description:
Some "if defined.." clauses contain simple typo OPNESSL instead of
OPENSSL. This typo might lead to missing or wrong functionality in some
systems.
Attached are patches to following openssl versions:
- OpenSSL head: openssl-SNAP-typo.patch
- OpenSSL 1.0.1 stable: openssl-1.0.1-typo.patch
- OpenSSL 1.0.0 stable: openssl-1.0.0e-typo.patch
--
Leena Heino University of Tampere / Computer Centre
( liinu at uta.fi ) ( http://www.uta.fi/laitokset/tkk )
diff -Naur openssl-SNAP-20110924.orig/crypto/modes/modes_lcl.h
openssl-SNAP-20110924/crypto/modes/modes_lcl.h
--- openssl-SNAP-20110924.orig/crypto/modes/modes_lcl.h 2011-04-18
17:00:05.000000000 +0300
+++ openssl-SNAP-20110924/crypto/modes/modes_lcl.h 2011-09-24
14:06:07.872724850 +0300
@@ -36,7 +36,7 @@
# undef STRICT_ALIGNMENT
#endif
-#if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) &&
!defined(OPNESSL_NO_INLINE_ASM)
+#if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) &&
!defined(OPENSSL_NO_INLINE_ASM)
#if defined(__GNUC__) && __GNUC__>=2
# if defined(__x86_64) || defined(__x86_64__)
# define BSWAP8(x) ({ u64 ret=(x); \
diff -Naur openssl-SNAP-20110924.orig/crypto/rand/randfile.c
openssl-SNAP-20110924/crypto/rand/randfile.c
--- openssl-SNAP-20110924.orig/crypto/rand/randfile.c 2011-03-19
13:00:04.000000000 +0200
+++ openssl-SNAP-20110924/crypto/rand/randfile.c 2011-09-24
14:06:07.872740000 +0300
@@ -137,7 +137,7 @@
in=fopen(file,"rb");
#endif
if (in == NULL) goto err;
-#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPNESSL_NO_POSIX_IO)
+#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPENSSL_NO_POSIX_IO)
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
/* this file is a device. we don't want read an infinite number
* of bytes from a random device, nor do we want to use buffered
diff -Naur openssl-1.0.1-stable-SNAP-20110924.orig/crypto/modes/modes_lcl.h
openssl-1.0.1-stable-SNAP-20110924/crypto/modes/modes_lcl.h
--- openssl-1.0.1-stable-SNAP-20110924.orig/crypto/modes/modes_lcl.h
2011-08-04 14:12:38.000000000 +0300
+++ openssl-1.0.1-stable-SNAP-20110924/crypto/modes/modes_lcl.h 2011-09-24
14:02:14.032850800 +0300
@@ -36,7 +36,7 @@
# undef STRICT_ALIGNMENT
#endif
-#if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) &&
!defined(OPNESSL_NO_INLINE_ASM)
+#if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) &&
!defined(OPENSSL_NO_INLINE_ASM)
#if defined(__GNUC__) && __GNUC__>=2
# if defined(__x86_64) || defined(__x86_64__)
# define BSWAP8(x) ({ u64 ret=(x); \
diff -Naur openssl-1.0.1-stable-SNAP-20110924.orig/crypto/rand/randfile.c
openssl-1.0.1-stable-SNAP-20110924/crypto/rand/randfile.c
--- openssl-1.0.1-stable-SNAP-20110924.orig/crypto/rand/randfile.c
2011-03-19 12:00:17.000000000 +0200
+++ openssl-1.0.1-stable-SNAP-20110924/crypto/rand/randfile.c 2011-09-24
14:02:14.032865150 +0300
@@ -137,7 +137,7 @@
in=fopen(file,"rb");
#endif
if (in == NULL) goto err;
-#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPNESSL_NO_POSIX_IO)
+#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPENSSL_NO_POSIX_IO)
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
/* this file is a device. we don't want read an infinite number
* of bytes from a random device, nor do we want to use buffered
diff -Naur openssl-1.0.1-stable-SNAP-20110924.orig/ssl/ssl_algs.c
openssl-1.0.1-stable-SNAP-20110924/ssl/ssl_algs.c
--- openssl-1.0.1-stable-SNAP-20110924.orig/ssl/ssl_algs.c 2011-08-24
00:00:20.000000000 +0300
+++ openssl-1.0.1-stable-SNAP-20110924/ssl/ssl_algs.c 2011-09-24
14:02:14.032874900 +0300
@@ -88,7 +88,7 @@
EVP_add_cipher(EVP_aes_128_cbc());
EVP_add_cipher(EVP_aes_192_cbc());
EVP_add_cipher(EVP_aes_256_cbc());
-#if !defined(OPENSSL_NO_SHA) && !defined(OPNESSL_NO_SHA1)
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
#endif
diff -Naur openssl-1.0.0e.orig/crypto/rand/randfile.c
openssl-1.0.0e/crypto/rand/randfile.c
--- openssl-1.0.0e.orig/crypto/rand/randfile.c 2011-03-19 11:44:37.000000000
+0200
+++ openssl-1.0.0e/crypto/rand/randfile.c 2011-09-24 14:08:09.468965150
+0300
@@ -137,7 +137,7 @@
in=fopen(file,"rb");
#endif
if (in == NULL) goto err;
-#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPNESSL_NO_POSIX_IO)
+#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPENSSL_NO_POSIX_IO)
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
/* this file is a device. we don't want read an infinite number
* of bytes from a random device, nor do we want to use buffered
