4853 illumos-gate is not lint-clean when built with openssl 1.0

          --- old/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
          +++ new/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com

   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  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  22   22  # Use is subject to license terms.
  23   23  #
  24   24  LIBRARY =       pkcs11_tpm.a
  25   25  VERS =          .1
  26   26  
  27   27  OBJECTS= api_interface.o \
  28   28          apiutil.o \
  29   29          asn1.o \
  30   30          cert.o \
  31   31          data_obj.o \
  32   32          decr_mgr.o \
  33   33          dig_mgr.o \
  34   34          encr_mgr.o \
  35   35          globals.o \
  36   36          hwf_obj.o \
  37   37          key.o \
  38   38          key_mgr.o \
  39   39          loadsave.o \
  40   40          log.o \
  41   41          mech_md5.o \
  42   42          mech_rsa.o \
  43   43          mech_sha.o \
  44   44          new_host.o \
  45   45          obj_mgr.o \
  46   46          object.o \
  47   47          sess_mgr.o \
  48   48          sign_mgr.o \
  49   49          template.o \
  50   50          tpm_specific.o \
  51   51          utility.o \
  52   52          verify_mgr.o
  53   53  
  54   54  
  55   55  include $(SRC)/lib/Makefile.lib
  56   56  
  57   57  SRCDIR= ../common
  58   58  
  59   59  SRCS=   $(OBJECTS:%.o=$(SRCDIR)/%.c)
  60   60  
  61   61  #       set signing mode
  62   62  POST_PROCESS_SO +=      ; $(ELFSIGN_CRYPTO)
  63   63  
  64   64  ROOTLIBDIR=$(ROOT)/usr/lib/security
  65   65  ROOTLIBDIR64=$(ROOT)/usr/lib/security/$(MACH64)

  66   66  
  67   67  LIBS=$(DYNLIB) $(DYNLIB64)
  68   68  
  69   69  TSSROOT=$(ADJUNCT_PROTO)
  70   70  TSPILIBDIR=$(TSSROOT)/usr/lib
  71   71  TSPIINCDIR=$(TSSROOT)/usr/include
  72   72  TSSLIB=-L$(TSPILIBDIR)
  73   73  TSSLIB64=-L$(TSPILIBDIR)/$(MACH64)
  74   74  TSSINC=-I$(TSPIINCDIR)
  75   75  
  76      -LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto
       76 +LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi
       77 +
       78 +# libsunw_crypto has no lint library, so we can only use it when
       79 +# building
       80 +$(LIBS) := LDLIBS += -lsunw_crypto
  77   81  CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC)
  78   82  CPPFLAGS64 += $(CPPFLAGS)
  79   83  C99MODE=        $(C99_ENABLE)
  80   84  
  81   85  CERRWARN +=     -_gcc=-Wno-parentheses
  82   86  CERRWARN +=     -_gcc=-Wno-unused-label
  83   87  CERRWARN +=     -_gcc=-Wno-uninitialized
  84   88  
  85   89  LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c)
  86   90  

  87   91  $(LINTLIB):=    SRCS    =       $(SRCDIR)/$(LINTSRC)
  88   92  LINTSRC= $(SRCS)
  89   93  
  90   94  CLOBBERFILES += C.ln
  91   95  
  92   96  .KEEP_STATE:
  93   97  
  94   98  all: $(LIBS)
  95   99   
  96  100  lint: $$(LINTSRC)
  97  101          $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS)
  98  102  
  99  103  pics/%.o: $(SRCDIR)/%.c
 100  104          $(COMPILE.c) -o $@ $<
 101  105          $(POST_PROCESS_O)
 102  106  
 103  107  include $(SRC)/lib/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX