5072963 Need an optimized AES implementation for amd64

          --- old/usr/src/lib/pkcs11/pkcs11_softtoken/amd64/Makefile
          +++ new/usr/src/lib/pkcs11/pkcs11_softtoken/amd64/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25      -# ident "@(#)Makefile   1.5     08/03/20 SMI"
       25 +# ident "@(#)Makefile   1.6     08/05/23 SMI"
  26   26  #
  27   27  # lib/pkcs11/pkcs11_softtoken/amd64/Makefile
  28   28  
  29      -AES_PSR_OBJECTS =
  30      -ARCFOUR_PSR_OBJECTS =  arcfour-x86_64.o
       29 +AES_PSR_OBJECTS = aes_amd64.o aeskey.o
       30 +ARCFOUR_PSR_OBJECTS = arcfour-x86_64.o
  31   31  DES_PSR_OBJECTS =
  32   32  RSA_PSR_OBJECTS =
  33   33  BIGNUM_PSR_OBJECTS = bignum_amd64.o bignum_amd64_asm.o
  34   34  BIGNUM_PSR_PICS = $(BIGNUM_PSR_OBJECTS:%=pics/%)
  35   35  BIGNUM_CFG = -DPSR_MUL
  36   36  BIGNUM_PSR_SRCS = \
  37      -        $(BIGNUMDIR)/amd64/bignum_amd64.c \
  38      -        $(BIGNUMDIR)/amd64/bignum_amd64_asm.s
       37 +        $(BIGNUMDIR)/$(MACH64)/bignum_amd64.c \
       38 +        $(BIGNUMDIR)/$(MACH64)/bignum_amd64_asm.s
  39   39  
  40   40  pics/bignum_amd64.o := amd64_COPTFLAG = -xO3
  41   41  
  42   42  include ../Makefile.com
  43   43  include ../../../Makefile.lib.64
  44   44  
  45   45  #
  46   46  # Overrides
  47   47  #
  48   48  CLEANFILES      += arcfour-x86_64.s
  49   49  
  50   50  install: all $(ROOTLIBS64) $(ROOTLINKS64)
  51   51  
  52   52  $(BIGNUM_PSR_PICS) := CFLAGS += $(C_BIGPICFLAGS) $(BIGNUM_CFG)
  53   53  
  54   54  LINTFLAGS64 += $(BIGNUM_CFG)
  55   55  
  56      -pics/arcfour-x86_64.o: arcfour-x86_64.s
  57      -        $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) ${@F:.o=.s}
       56 +pics/%.o: %.s
       57 +        $(COMPILE.s) -o $@ $<
  58   58          $(POST_PROCESS_O)
  59   59  
  60      -arcfour-x86_64.s: $(ARCFOURDIR)/amd64/arcfour-x86_64.pl
       60 +arcfour-x86_64.s: $(ARCFOURDIR)/$(MACH64)/arcfour-x86_64.pl
  61   61          $(PERL) $? $@
  62   62  
  63   63  pics/%.o: $(BIGNUMDIR)/$(MACH64)/%.c
  64   64          $(COMPILE.c) -o $@ $(C_BIGPICFLAGS) $(BIGNUM_CFG) $<
  65   65          $(POST_PROCESS_O)
  66   66  
  67   67  pics/%.o: $(BIGNUMDIR)/$(MACH64)/%.s
  68   68          $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) $(BIGNUM_CFG) $<
       69 +        $(POST_PROCESS_O)
       70 +
       71 +pics/%.o: $(AESDIR)/$(MACH64)/%.c
       72 +        $(COMPILE.c) -o $@ $(AESDIR)/$(MACH64)/${@F:.o=.c}
       73 +        $(POST_PROCESS_O)
       74 +
       75 +pics/%.o: $(AESDIR)/$(MACH64)/%.s
       76 +        $(COMPILE.s) -o $@ $<
  69   77          $(POST_PROCESS_O)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX