From: Andy Polyakov <appro@openssl.org>
Date: Sun, 15 Jan 2012 13:40:21 +0000 (+0000)
Subject: Fix OPNESSL vs. OPENSSL typos [from HEAD].
X-Git-Tag: OpenSSL_1_0_1-beta2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4fb7e2b4454cedef93cee01a156973d5c2e84d83;p=oweals%2Fopenssl.git

Fix OPNESSL vs. OPENSSL typos [from HEAD].
PR: 2613
Submitted by: Leena Heino
---

diff --git a/crypto/modes/modes_lcl.h b/crypto/modes/modes_lcl.h
index 4dab6a67fe..7a82a981ca 100644
--- a/crypto/modes/modes_lcl.h
+++ b/crypto/modes/modes_lcl.h
@@ -36,7 +36,7 @@ typedef unsigned char u8;
 # 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 --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index bc7d9c5804..030e07f418 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -137,7 +137,7 @@ int RAND_load_file(const char *file, long bytes)
 	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