1 files changed, 12 insertions, 21 deletions

diff --git a/src/lib/libssl/src/fips-1.0/fips_locl.h b/src/lib/libcrypto/rc4/rc4_utl.c
index bbddfaab82..ab3f02fe6a 100644
--- a/src/lib/libssl/src/fips-1.0/fips_locl.h
+++ b/src/lib/libcrypto/rc4/rc4_utl.c
@@ -1,5 +1,6 @@
+/* crypto/rc4/rc4_utl.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2011 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
@@ -44,28 +45,18 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
  *
  */
 
-#ifdef OPENSSL_FIPS
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+#include <openssl/rc4.h>
 
-/* These are trampolines implemented in crypto/cryptlib.c */
-void fips_w_lock(void);
-void fips_w_unlock(void);
-void fips_r_lock(void);
-void fips_r_unlock(void);
-int fips_is_started(void);
-void fips_set_started(void);
-int fips_is_owning_thread(void);
-int fips_set_owning_thread(void);
-int fips_clear_owning_thread(void);
-unsigned char *fips_signature_witness(void);
-
-#ifdef  __cplusplus
-}
-#endif
+void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
+        {
+#ifdef OPENSSL_FIPS
+        fips_cipher_abort(RC4);
 #endif
+        private_RC4_set_key(key, len, data);
+        }