6652716 Need an ARCFOUR implementation optimized for Intel EM64T

*** 24,34 ****
   */
  
  #ifndef _SYS_CRYPTO_COMMON_H
  #define _SYS_CRYPTO_COMMON_H
  
! #pragma ident   "@(#)common.h   1.26    08/01/04 SMI"
  
  /*
   * Header file for the common data structures of the cryptographic framework
   */
  
--- 24,34 ----
   */
  
  #ifndef _SYS_CRYPTO_COMMON_H
  #define _SYS_CRYPTO_COMMON_H
  
! #pragma ident   "@(#)common.h   1.27    08/03/20 SMI"
  
  /*
   * Header file for the common data structures of the cryptographic framework
   */
  
*** 185,203 ****
  #define SUN_CKM_ECDH1_DERIVE            "CKM_ECDH1_DERIVE"
  #define SUN_CKM_ECDSA_SHA1              "CKM_ECDSA_SHA1"
  #define SUN_CKM_ECDSA                   "CKM_ECDSA"
  
  /* Shared operation context format for CKM_RC4 */
  #if defined(__amd64)
! typedef uint64_t arcfour_key_int_t;
  #else
! typedef uchar_t arcfour_key_int_t;
  #endif /* __amd64 */
- 
- typedef struct {
-         arcfour_key_int_t arr[256];
-         arcfour_key_int_t i, j;
          uint64_t pad;           /* For 64-bit alignment */
  } arcfour_state_t;
  
  /* Data arguments of cryptographic operations */
  
--- 185,202 ----
  #define SUN_CKM_ECDH1_DERIVE            "CKM_ECDH1_DERIVE"
  #define SUN_CKM_ECDSA_SHA1              "CKM_ECDSA_SHA1"
  #define SUN_CKM_ECDSA                   "CKM_ECDSA"
  
  /* Shared operation context format for CKM_RC4 */
+ typedef struct {
  #if defined(__amd64)
!         uint32_t i, j;
!         uint32_t arr[256];
  #else
!         uchar_t arr[256];
!         uchar_t i, j;
  #endif /* __amd64 */
          uint64_t pad;           /* For 64-bit alignment */
  } arcfour_state_t;
  
  /* Data arguments of cryptographic operations */