4 files changed, 14 insertions, 1 deletions
diff --git a/usr/src/common/openssl/crypto/rc2/rc2.h b/usr/src/common/openssl/crypto/rc2/rc2.h
index 7816b454dc..34c8362317 100644
--- a/usr/src/common/openssl/crypto/rc2/rc2.h
+++ b/usr/src/common/openssl/crypto/rc2/rc2.h
@@ -59,6 +59,7 @@
 #ifndef HEADER_RC2_H
 #define HEADER_RC2_H
 
+#include <openssl/opensslconf.h> /* OPENSSL_NO_RC2, RC2_INT */
 #ifdef OPENSSL_NO_RC2
 #error RC2 is disabled.
 #endif
@@ -66,7 +67,6 @@
 #define RC2_ENCRYPT	1
 #define RC2_DECRYPT	0
 
-#include <openssl/opensslconf.h> /* RC2_INT */
 #define RC2_BLOCK	8
 #define RC2_KEY_LENGTH	16
 
diff --git a/usr/src/common/openssl/crypto/rc2/rc2_skey.c b/usr/src/common/openssl/crypto/rc2/rc2_skey.c
index cab3080c73..4953642056 100644
--- a/usr/src/common/openssl/crypto/rc2/rc2_skey.c
+++ b/usr/src/common/openssl/crypto/rc2/rc2_skey.c
@@ -84,6 +84,10 @@ static unsigned char key_table[256]={
 	0xfe,0x7f,0xc1,0xad,
 	};
 
+#if defined(_MSC_VER) && defined(_ARM_)
+#pragma optimize("g",off)
+#endif
+
 /* It has come to my attention that there are 2 versions of the RC2
  * key schedule.  One which is normal, and anther which has a hook to
  * use a reduced key length.
@@ -136,3 +140,6 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
 		*(ki--)=((k[i]<<8)|k[i-1])&0xffff;
 	}
 
+#if defined(_MSC_VER)
+#pragma optimize("",on)
+#endif
diff --git a/usr/src/common/openssl/crypto/rc2/rc2speed.c b/usr/src/common/openssl/crypto/rc2/rc2speed.c
index 47d34b444e..b16e6e2ed1 100644
--- a/usr/src/common/openssl/crypto/rc2/rc2speed.c
+++ b/usr/src/common/openssl/crypto/rc2/rc2speed.c
@@ -69,7 +69,10 @@
 #include OPENSSL_UNISTD_IO
 OPENSSL_DECLARE_EXIT
 
+#ifndef OPENSSL_SYS_NETWARE
 #include <signal.h>
+#endif
+
 #ifndef _IRIX
 #include <time.h>
 #endif
diff --git a/usr/src/common/openssl/crypto/rc2/rc2test.c b/usr/src/common/openssl/crypto/rc2/rc2test.c
index b67bafb49f..0e117436bb 100644
--- a/usr/src/common/openssl/crypto/rc2/rc2test.c
+++ b/usr/src/common/openssl/crypto/rc2/rc2test.c
@@ -205,6 +205,9 @@ int main(int argc, char *argv[])
 		printf("ok\n");
 #endif
 
+#ifdef OPENSSL_SYS_NETWARE
+    if (err) printf("ERROR: %d\n", err);
+#endif
 	EXIT(err);
 	return(err);
 	}