6665607 Need a SHA256/SHA384/SHA512 implementation optimized for 64-bit x86

*** 20,30 ****
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
! # ident "@(#)Makefile.com       1.5     08/02/26 SMI"
  #
  # lib/pkcs11/pkcs11_softtoken/Makefile.com
  #
  
  LIBRARY = pkcs11_softtoken.a
--- 20,30 ----
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
! # ident "@(#)Makefile.com       1.6     08/03/05 SMI"
  #
  # lib/pkcs11/pkcs11_softtoken/Makefile.com
  #
  
  LIBRARY = pkcs11_softtoken.a
*** 93,104 ****
  DES_OBJECTS = $(DES_COBJECTS) $(DES_PSR_OBJECTS)
  
  ECC_OBJECTS = $(ECC_COBJECTS) $(ECC_PSR_OBJECTS)
  MPI_OBJECTS = $(MPI_COBJECTS) $(MPI_PSR_OBJECTS)
  RSA_OBJECTS = $(RSA_COBJECTS) $(RSA_PSR_OBJECTS)
- SHA1_OBJECTS = $(SHA1_COBJECTS) $(SHA1_PSR_OBJECTS)
- SHA2_OBJECTS = $(SHA2_COBJECTS) $(SHA2_PSR_OBJECTS)
  BIGNUM_OBJECTS = $(BIGNUM_COBJECTS) $(BIGNUM_PSR_OBJECTS)
  
  BER_OBJECTS = bprint.o decode.o encode.o io.o
  
  # Sparc userland uses a floating-point implementation of
--- 93,102 ----
*** 130,141 ****
          $(BLOWFISH_OBJECTS)     \
          $(ARCFOUR_OBJECTS)      \
          $(DES_OBJECTS)          \
          $(MPI_OBJECTS)          \
          $(RSA_OBJECTS)          \
-         $(SHA1_OBJECTS)         \
-         $(SHA2_OBJECTS)         \
          $(BIGNUM_OBJECTS)       \
          $(BER_OBJECTS)          \
          $(ECC_OBJECTS)
  
  AESDIR=         $(SRC)/common/crypto/aes
--- 128,137 ----
*** 161,172 ****
          $(BLOWFISH_COBJECTS:%.o=$(BLOWFISHDIR)/%.c) \
          $(ARCFOUR_COBJECTS:%.o=$(ARCFOURDIR)/%.c) \
          $(DES_COBJECTS:%.o=$(DESDIR)/%.c) \
          $(MPI_COBJECTS:%.o=$(MPIDIR)/%.c) \
          $(RSA_COBJECTS:%.o=$(RSADIR)/%.c) \
-         $(SHA1_COBJECTS:%.o=$(SHA1DIR)/%.c) \
-         $(SHA2_COBJECTS:%.o=$(SHA2DIR)/%.c) \
          $(BIGNUM_COBJECTS:%.o=$(BIGNUMDIR)/%.c) \
          $(BIGNUM_PSR_SRCS) \
          $(ECC_COBJECTS:%.o=$(ECCDIR)/%.c)
  
  # libelfsign needs a static pkcs11_softtoken
--- 157,166 ----
*** 189,200 ****
          $(AES_COBJECTS:%.o=$(AESDIR)/%.c) \
          $(BLOWFISH_COBJECTS:%.o=$(BLOWFISHDIR)/%.c) \
          $(ARCFOUR_COBJECTS:%.o=$(ARCFOURDIR)/%.c) \
          $(DES_COBJECTS:%.o=$(DESDIR)/%.c) \
          $(RSA_COBJECTS:%.o=$(RSADIR)/%.c) \
-         $(SHA1_COBJECTS:%.o=$(SHA1DIR)/%.c) \
-         $(SHA2_COBJECTS:%.o=$(SHA2DIR)/%.c) \
          $(BIGNUM_COBJECTS:%.o=$(BIGNUMDIR)/%.c) \
          $(BIGNUM_PSR_SRCS)
  
  .KEEP_STATE:
  
--- 183,192 ----
*** 228,245 ****
          $(POST_PROCESS_O)
  
  pics/%.o:       $(RSADIR)/%.c
          $(COMPILE.c) -o $@ $<
          $(POST_PROCESS_O)
- 
- pics/%.o:       $(SHA1DIR)/%.c
-         $(COMPILE.c) -o $@ $<
-         $(POST_PROCESS_O)
- 
- pics/%.o:       $(SHA2DIR)/%.c
-         $(COMPILE.c) -o $@ $<
-         $(POST_PROCESS_O)
  
  pics/%.o:       $(BIGNUMDIR)/%.c
          $(COMPILE.c) -o $@ $(BIGNUM_CFG) $<
          $(POST_PROCESS_O)
  
--- 220,229 ----