Print this page
9156 Remove openssl dependency from pkcs11_tpm

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
          +++ new/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
↓ open down ↓ 13 lines elided ↑ open up ↑
  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  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  22   22  # Use is subject to license terms.
  23   23  #
       24 +# Copyright 2018 Jason King
       25 +#
  24   26  LIBRARY =       pkcs11_tpm.a
  25   27  VERS =          .1
  26   28  
       29 +RSA_DIR =               $(SRC)/common/crypto/rsa
       30 +RSA_FLAGS =             -I$(RSA_DIR)
       31 +
       32 +BIGNUM_DIR =            $(SRC)/common/bignum
       33 +BIGNUM_FLAGS =          -I$(BIGNUM_DIR)
       34 +
       35 +PADDING_DIR =           $(SRC)/common/crypto/padding
       36 +PADDING_FLAGS =         -I$(PADDING_DIR)
       37 +
       38 +SOFTCRYPTOFLAGS =       $(RSA_FLAGS) $(PADDING_FLAGS) $(BIGNUM_FLAGS)
       39 +
  27   40  OBJECTS= api_interface.o \
  28   41          apiutil.o \
  29   42          asn1.o \
  30   43          cert.o \
  31   44          data_obj.o \
  32   45          decr_mgr.o \
  33   46          dig_mgr.o \
  34   47          encr_mgr.o \
  35   48          globals.o \
  36   49          hwf_obj.o \
↓ open down ↓ 29 lines elided ↑ open up ↑
  66   79  
  67   80  LIBS=$(DYNLIB) $(DYNLIB64)
  68   81  
  69   82  TSSROOT=$(ADJUNCT_PROTO)
  70   83  TSPILIBDIR=$(TSSROOT)/usr/lib
  71   84  TSPIINCDIR=$(TSSROOT)/usr/include
  72   85  TSSLIB=-L$(TSPILIBDIR)
  73   86  TSSLIB64=-L$(TSPILIBDIR)/$(MACH64)
  74   87  TSSINC=-I$(TSPIINCDIR)
  75   88  
  76      -LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto
  77      -CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC)
       89 +LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lsoftcrypto
       90 +CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC) $(SOFTCRYPTOFLAGS)
  78   91  CPPFLAGS64 += $(CPPFLAGS)
  79   92  CSTD=        $(CSTD_GNU99)
  80   93  
  81   94  CERRWARN +=     -_gcc=-Wno-parentheses
  82   95  CERRWARN +=     -_gcc=-Wno-unused-label
  83   96  CERRWARN +=     -_gcc=-Wno-uninitialized
  84   97  
  85   98  LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c)
  86   99  
  87  100  $(LINTLIB):=    SRCS    =       $(SRCDIR)/$(LINTSRC)
↓ open down ↓ 16 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX