From cd277642e0bdc71a7f57c550df1279b0c091d6e2 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 28 Mar 2017 11:08:00 +0300 Subject: [PATCH] 5157 remove ELFSIGN leftovers from nightly Reviewed by: Yuri Pankov Reviewed by: Toomas Soome Approved by: Gordon Ross --- exception_lists/packaging | 2 - usr/src/Makefile.master | 5 -- usr/src/pkg/manifests/developer-build-onbld.mf | 1 - usr/src/tools/Makefile | 1 - usr/src/tools/README.tools | 12 --- usr/src/tools/elfsign/Makefile | 75 ---------------- usr/src/tools/elfsign/elfsigncmp.sh | 114 ------------------------- usr/src/tools/elfsign/inc.flg | 34 -------- usr/src/tools/scripts/nightly.sh | 39 +-------- usr/src/uts/Makefile.targ | 4 +- usr/src/uts/intel/aes/Makefile | 4 +- usr/src/uts/intel/arcfour/Makefile | 4 +- usr/src/uts/intel/blowfish/Makefile | 4 +- usr/src/uts/intel/dca/Makefile | 5 +- usr/src/uts/intel/des/Makefile | 5 +- usr/src/uts/intel/dprov/Makefile | 5 +- usr/src/uts/intel/ecc/Makefile | 5 +- usr/src/uts/intel/rsa/Makefile | 4 +- usr/src/uts/sparc/aes/Makefile | 4 +- usr/src/uts/sparc/arcfour/Makefile | 4 +- usr/src/uts/sparc/blowfish/Makefile | 4 +- usr/src/uts/sparc/dca/Makefile | 5 +- usr/src/uts/sparc/des/Makefile | 5 +- usr/src/uts/sparc/dprov/Makefile | 4 +- usr/src/uts/sparc/ecc/Makefile | 4 +- usr/src/uts/sparc/rsa/Makefile | 4 +- usr/src/uts/sun4u/aes/Makefile | 5 +- usr/src/uts/sun4u/arcfour/Makefile | 5 +- usr/src/uts/sun4u/des/Makefile | 5 +- usr/src/uts/sun4v/arcfour/Makefile | 5 +- 30 files changed, 32 insertions(+), 345 deletions(-) delete mode 100644 usr/src/tools/elfsign/Makefile delete mode 100644 usr/src/tools/elfsign/elfsigncmp.sh delete mode 100644 usr/src/tools/elfsign/inc.flg diff --git a/exception_lists/packaging b/exception_lists/packaging index 54c545ecd4..069ea5f367 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -927,8 +927,6 @@ usr/lib/sparcv9/llib-lvrrpadm.ln sparc # # This is only used during the -t tools build # -opt/onbld/bin/i386/elfsign i386 -opt/onbld/bin/sparc/elfsign sparc opt/onbld/bin/i386/mandoc i386 opt/onbld/bin/sparc/mandoc sparc diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 61cd5c40e4..8d6f184994 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -186,7 +186,6 @@ TOUCH= /usr/bin/touch WC= /usr/bin/wc XARGS= /usr/bin/xargs ELFEDIT= /usr/bin/elfedit -ELFSIGN= /usr/bin/elfsign DTRACE= /usr/sbin/dtrace -xnolibs UNIQ= /usr/bin/uniq TAR= /usr/bin/tar @@ -917,10 +916,6 @@ CTFMRGFLAGS= CTFCONVERT_O = $(CTFCONVERT) $(CTFCVTFLAGS) $@ -ELFSIGN_O= $(TRUE) -ELFSIGN_CRYPTO= $(ELFSIGN_O) -ELFSIGN_OBJECT= $(ELFSIGN_O) - # Rules (normally from make.rules) and macros which are used for post # processing files. Normally, these do stripping of the comment section # automatically. diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 5bc5cf97e6..b8710ccb27 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -98,7 +98,6 @@ file path=opt/onbld/bin/checkproto mode=0555 file path=opt/onbld/bin/copyrightchk mode=0555 file path=opt/onbld/bin/cstyle mode=0555 file path=opt/onbld/bin/elfcmp mode=0555 -file path=opt/onbld/bin/elfsigncmp mode=0555 file path=opt/onbld/bin/find_elf mode=0555 file path=opt/onbld/bin/findcrypto mode=0555 file path=opt/onbld/bin/flg.flp mode=0555 diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile index c8485b216a..54ac3aba69 100644 --- a/usr/src/tools/Makefile +++ b/usr/src/tools/Makefile @@ -56,7 +56,6 @@ COMMON_SUBDIRS= \ # special versions of commands for use only in build # UNSHIPPED_SUBDIRS = \ - elfsign \ mandoc sparc_SUBDIRS= \ diff --git a/usr/src/tools/README.tools b/usr/src/tools/README.tools index 6cb51f028a..59f66a1fb6 100644 --- a/usr/src/tools/README.tools +++ b/usr/src/tools/README.tools @@ -157,18 +157,6 @@ elfcmp is used to test whether two binaries are the same except for the elfsign signature. -elfsign - Built from the same sources as the shipped elfsign(1), this - version is used in nightly -t builds to assure that the signing - process and format is the same as will be used on the target - system. - -elfsigncmp - This script can be used in lieu of elfsign during a build. - It uses elfsign to sign a copy of the object and elfcmp -S to - verify that the signing caused no damage before updating - the object to be signed. - find_elf Search a directory tree for ELF objects, and produce one line of output per object. Used by check_rtime and interface_check to locate diff --git a/usr/src/tools/elfsign/Makefile b/usr/src/tools/elfsign/Makefile deleted file mode 100644 index ece759e450..0000000000 --- a/usr/src/tools/elfsign/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -PROG= elfsign -SHFILES= elfsigncmp - -LIBOBJS= elfcertlib.o elfsignlib.o -OBJS= $(PROG).o $(LIBOBJS) - -.PARALLEL: $(OBJS) - -CMDDIR= $(SRC)/cmd/cmd-crypto/elfsign -LIBDIR= $(SRC)/lib/libelfsign/common -SRCS= $(CMDDIR)/$(PROG).c $(LIBOBJS:%.o=$(LIBDIR)/%.c) -CLEANFILES= $(PROG) $(OBJS) $(SHFILES) - -include ../../../src/tools/Makefile.tools - -CFLAGS += $(CCVERBOSE) -CFLAGS += -_gcc=-fasm - -CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -CPPFLAGS += -I$(SRC)/lib/libelfsign/common -CPPFLAGS += -I$(SRC)/uts/common -CPPFLAGS += -I$(SRC)/lib/libkmf/include -CPPFLAGS += -I$(SRC)/lib/libcryptoutil/common -LDFLAGS += -lmd -lelf -lkmf -lcryptoutil -lc - -CERRWARN += -_gcc=-Wno-unused - -.KEEP_STATE: - -all: $(PROG) $(SHFILES) - -install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDSHFILES) - -$(PROG): $(OBJS) - $(LINK.c) -o $@ $(OBJS) $(LDLIBS) - $(POST_PROCESS) - -%.o: $(CMDDIR)/%.c - $(COMPILE.c) -o $@ $< - -%.o: $(LIBDIR)/%.c - $(COMPILE.c) -o $@ $< - -lint: lint_SRCS - -clean: - $(RM) $(CLEANFILES) - -include ../../../src/tools/Makefile.targ diff --git a/usr/src/tools/elfsign/elfsigncmp.sh b/usr/src/tools/elfsign/elfsigncmp.sh deleted file mode 100644 index 97f046a166..0000000000 --- a/usr/src/tools/elfsign/elfsigncmp.sh +++ /dev/null @@ -1,114 +0,0 @@ -#! /usr/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -prog=$0 -pd=`dirname $prog` -MACH=`uname -p` -elfcmp=$pd/elfcmp -elfsign=$pd/$MACH/elfsign - -aopt= -copt= -eopt= -Fopt= -kopt= -vopt= - -Usage() { - echo "Usage: $prog {sign|verify} [-v] [-a]" \ - "[-c ] [-k ] [-F ] -e " 1>&2 - exit 1 -} - -if [ $# -lt 1 ]; then - Usage - fi -cmd=$1 -shift - -while getopts "ac:e:F:k:v" opt ; do - case $opt in - a) aopt=-a;; - c) copt="$OPTARG";; - e) eopt="$OPTARG";; - F) Fopt="$OPTARG";; - k) kopt="$OPTARG";; - v) vopt=-v;; - \?) Usage;; - esac -done - -case X$eopt in X) Usage;; esac - -tmpe=$eopt.e$$ -tmpo=$eopt.o$$ - -cpq() { - cp -p $1 $2 > /dev/null 2>&1 -} - -restore() { - cpq $tmpe $eopt -} - -cleanup() { - restore - rm -f $tmpe $tmpo -} - -trap cleanup 1 2 3 13 15 - -cpq $eopt $tmpe - -eval $elfsign $cmd $aopt $vopt ${copt:+-c} ${copt} ${kopt:+-k} ${kopt} \ - ${Fopt:+-F} ${Fopt} -e ${eopt} -rv=$? - -case $cmd:$rv in -sign:0) - if $elfcmp -v -S $tmpe $eopt > $tmpo 2>&1 - then - : # all's fine - else - rv=$? - echo "Warning: elfcmp failed: $eopt" 1>&2 - cat ${tmpo} 1>&2 - echo "current directory: `pwd`" 1>&2 - restore - cpq ${eopt} ${eopt}.elfcmp.failed.$$ - fi - ;; -sign:*) - restore - cpq ${eopt} ${eopt}.elfsign.failed.$$ - ;; -esac - -rm -f $tmpe $tmpo -exit $rv diff --git a/usr/src/tools/elfsign/inc.flg b/usr/src/tools/elfsign/inc.flg deleted file mode 100644 index 315fa0558d..0000000000 --- a/usr/src/tools/elfsign/inc.flg +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" - -echo_file usr/src/uts/common/sys/crypto/elfsign.h -find_files "s.*.h" \ - usr/src/lib/libcryptoutil/ -find_files "s.*" \ - usr/src/cmd/cmd-crypto/elfsign \ - usr/src/lib/libelfsign/ diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index a77d6f223e..3f4f45b6dd 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -522,13 +522,6 @@ function use_tools { CTFMERGE=${TOOLSROOT}/opt/onbld/bin/${MACH}/ctfmerge export CTFMERGE - if [ "$VERIFY_ELFSIGN" = "y" ]; then - ELFSIGN=${TOOLSROOT}/opt/onbld/bin/elfsigncmp - else - ELFSIGN=${TOOLSROOT}/opt/onbld/bin/${MACH}/elfsign - fi - export ELFSIGN - PATH="${TOOLSROOT}/opt/onbld/bin/${MACH}:${PATH}" PATH="${TOOLSROOT}/opt/onbld/bin:${PATH}" export PATH @@ -543,7 +536,6 @@ function use_tools { echo "CTFSTABS=${CTFSTABS}" >> $LOGFILE echo "CTFCONVERT=${CTFCONVERT}" >> $LOGFILE echo "CTFMERGE=${CTFMERGE}" >> $LOGFILE - echo "ELFSIGN=${ELFSIGN}" >> $LOGFILE echo "PATH=${PATH}" >> $LOGFILE echo "ONBLD_TOOLS=${ONBLD_TOOLS}" >> $LOGFILE } @@ -566,7 +558,7 @@ function staffer { # Verify that the closed bins are present # function check_closed_bins { - if [[ ! -d "$ON_CLOSED_BINS" ]]; then + if [[ -n "$ON_CLOSED_BINS" && ! -d "$ON_CLOSED_BINS" ]]; then echo "ON_CLOSED_BINS must point to the closed binaries tree." build_ok=n exit 1 @@ -1016,14 +1008,6 @@ mkdir -p $TMPDIR || exit 1 chmod 777 $TMPDIR # -# Keep elfsign's use of pkcs11_softtoken from looking in the user home -# directory, which doesn't always work. Needed until all build machines -# have the fix for 6271754 -# -SOFTTOKEN_DIR=$TMPDIR -export SOFTTOKEN_DIR - -# # Tools should only be built non-DEBUG. Keep track of the tools proto # area path relative to $TOOLS, because the latter changes in an # export build. @@ -1365,27 +1349,6 @@ if [ "$w_FLAG" = "y" -a ! -d $ROOT ]; then w_FLAG=n fi -if [ "$t_FLAG" = "n" ]; then - # - # We're not doing a tools build, so make sure elfsign(1) is - # new enough to safely sign non-crypto binaries. We test - # debugging output from elfsign to detect the old version. - # - newelfsigntest=`SUNW_CRYPTO_DEBUG=stderr /usr/bin/elfsign verify \ - -e /usr/lib/security/pkcs11_softtoken.so.1 2>&1 \ - | egrep algorithmOID` - if [ -z "$newelfsigntest" ]; then - echo "WARNING: /usr/bin/elfsign out of date;" \ - "will only sign crypto modules\n" | \ - tee -a $mail_msg_file >> $LOGFILE - export ELFSIGN_OBJECT=true - elif [ "$VERIFY_ELFSIGN" = "y" ]; then - echo "WARNING: VERIFY_ELFSIGN=y requires" \ - "the -t flag; ignoring VERIFY_ELFSIGN\n" | \ - tee -a $mail_msg_file >> $LOGFILE - fi -fi - case $MULTI_PROTO in yes|no) ;; *) diff --git a/usr/src/uts/Makefile.targ b/usr/src/uts/Makefile.targ index 497cdc88cb..93a2bcc5ae 100644 --- a/usr/src/uts/Makefile.targ +++ b/usr/src/uts/Makefile.targ @@ -20,6 +20,7 @@ # # # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2014 Garrett D'Amore # Copyright 2016 Hans Rosenfeld # # This Makefiles contains the common targets and definitions for @@ -48,14 +49,11 @@ $(OBJECTS): $(INLINES) # # Partially link .o files to generate the kmod. The fake dependency # on modstubs simplifies things... -# ELFSIGN_MOD is defined in the individual KCF plug-in modules Makefiles, -# and will sign the ELF objects using elfsign(1). # $(BINARY): $(OBJECTS) $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS) $(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX) $(POST_PROCESS) - $(ELFSIGN_MOD) # # This target checks each kmod for undefined entry points. It does not diff --git a/usr/src/uts/intel/aes/Makefile b/usr/src/uts/intel/aes/Makefile index b2b6ee68f3..d48f310aaa 100644 --- a/usr/src/uts/intel/aes/Makefile +++ b/usr/src/uts/intel/aes/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -49,9 +50,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/arcfour/Makefile b/usr/src/uts/intel/arcfour/Makefile index 8411182355..ba66fafbe1 100644 --- a/usr/src/uts/intel/arcfour/Makefile +++ b/usr/src/uts/intel/arcfour/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -49,9 +50,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/blowfish/Makefile b/usr/src/uts/intel/blowfish/Makefile index bc4746e129..97ddabc38e 100644 --- a/usr/src/uts/intel/blowfish/Makefile +++ b/usr/src/uts/intel/blowfish/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/dca/Makefile b/usr/src/uts/intel/dca/Makefile index 1ccc3e9bbc..a1ff33c62a 100644 --- a/usr/src/uts/intel/dca/Makefile +++ b/usr/src/uts/intel/dca/Makefile @@ -20,6 +20,8 @@ # # +# Copyright 2014 Garrett D'Amore +# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -49,9 +51,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/des/Makefile b/usr/src/uts/intel/des/Makefile index e9512fabe6..2c8045b380 100644 --- a/usr/src/uts/intel/des/Makefile +++ b/usr/src/uts/intel/des/Makefile @@ -21,6 +21,8 @@ # # uts/intel/des/Makefile # +# Copyright 2014 Garrett D'Amore +# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -54,9 +56,6 @@ LINK_TARGET = $(TARGET_$(CLASS)) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/dprov/Makefile b/usr/src/uts/intel/dprov/Makefile index 4ecb5915ef..b0e2a55091 100644 --- a/usr/src/uts/intel/dprov/Makefile +++ b/usr/src/uts/intel/dprov/Makefile @@ -19,6 +19,8 @@ # CDDL HEADER END # # +# Copyright 2014 Garrett D'Amore +# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -53,9 +55,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/ecc/Makefile b/usr/src/uts/intel/ecc/Makefile index 9d3c1bce9e..3302d43e23 100644 --- a/usr/src/uts/intel/ecc/Makefile +++ b/usr/src/uts/intel/ecc/Makefile @@ -19,6 +19,8 @@ # CDDL HEADER END # # +# Copyright 2014 Garrett D'Amore +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,9 +50,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/rsa/Makefile b/usr/src/uts/intel/rsa/Makefile index e05d3e307d..cf9ba78959 100644 --- a/usr/src/uts/intel/rsa/Makefile +++ b/usr/src/uts/intel/rsa/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/aes/Makefile b/usr/src/uts/sparc/aes/Makefile index c452dfeb6d..eae7c2dce7 100644 --- a/usr/src/uts/sparc/aes/Makefile +++ b/usr/src/uts/sparc/aes/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -46,9 +47,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/arcfour/Makefile b/usr/src/uts/sparc/arcfour/Makefile index f131035d48..7bfbdfc7ce 100644 --- a/usr/src/uts/sparc/arcfour/Makefile +++ b/usr/src/uts/sparc/arcfour/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -46,9 +47,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/blowfish/Makefile b/usr/src/uts/sparc/blowfish/Makefile index b7dfdc8fe6..88d56bb251 100644 --- a/usr/src/uts/sparc/blowfish/Makefile +++ b/usr/src/uts/sparc/blowfish/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -47,9 +48,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/dca/Makefile b/usr/src/uts/sparc/dca/Makefile index bea36330f6..f4420ccd16 100644 --- a/usr/src/uts/sparc/dca/Makefile +++ b/usr/src/uts/sparc/dca/Makefile @@ -20,6 +20,8 @@ # # +# Copyright 2014 Garrett D'Amore +# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -49,9 +51,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/des/Makefile b/usr/src/uts/sparc/des/Makefile index 90bc58b943..abf71ab827 100644 --- a/usr/src/uts/sparc/des/Makefile +++ b/usr/src/uts/sparc/des/Makefile @@ -21,6 +21,8 @@ # # uts/sparc/des/Makefile # +# Copyright 2014 Garrett D'Amore +# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -54,9 +56,6 @@ LINK_TARGET = $(TARGET_$(CLASS)) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/dprov/Makefile b/usr/src/uts/sparc/dprov/Makefile index 330fd4da81..0aa53e059a 100644 --- a/usr/src/uts/sparc/dprov/Makefile +++ b/usr/src/uts/sparc/dprov/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -53,9 +54,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/ecc/Makefile b/usr/src/uts/sparc/ecc/Makefile index 86170b2387..8876c0ab9e 100644 --- a/usr/src/uts/sparc/ecc/Makefile +++ b/usr/src/uts/sparc/ecc/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/rsa/Makefile b/usr/src/uts/sparc/rsa/Makefile index 88a8cb52bd..ea61e30cea 100644 --- a/usr/src/uts/sparc/rsa/Makefile +++ b/usr/src/uts/sparc/rsa/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4u/aes/Makefile b/usr/src/uts/sun4u/aes/Makefile index b74906bbc7..8042737faa 100644 --- a/usr/src/uts/sun4u/aes/Makefile +++ b/usr/src/uts/sun4u/aes/Makefile @@ -21,6 +21,8 @@ # # uts/sun4u/aes/Makefile # +# Copyright 2014 Garrett D'Amore +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -50,9 +52,6 @@ ROOTMODULE = $(ROOT_US3_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4u/arcfour/Makefile b/usr/src/uts/sun4u/arcfour/Makefile index 4eca278804..239cc9631e 100644 --- a/usr/src/uts/sun4u/arcfour/Makefile +++ b/usr/src/uts/sun4u/arcfour/Makefile @@ -21,6 +21,8 @@ # # uts/sun4u/arcfour/Makefile # +# Copyright 2014 Garrett D'Amore +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,9 +50,6 @@ ROOTMODULE = $(ROOT_PSM_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4u/des/Makefile b/usr/src/uts/sun4u/des/Makefile index 50ce1ffb01..e4b2fa80d0 100644 --- a/usr/src/uts/sun4u/des/Makefile +++ b/usr/src/uts/sun4u/des/Makefile @@ -21,6 +21,8 @@ # # uts/sun4u/des/Makefile # +# Copyright 2014 Garrett D'Amore +# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -54,9 +56,6 @@ LINK_TARGET = $(TARGET_$(CLASS)) # include $(UTSBASE)/sun4u/Makefile.sun4u -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4v/arcfour/Makefile b/usr/src/uts/sun4v/arcfour/Makefile index d8d34256e1..d97ef72d2d 100644 --- a/usr/src/uts/sun4v/arcfour/Makefile +++ b/usr/src/uts/sun4v/arcfour/Makefile @@ -21,6 +21,8 @@ # # uts/sun4v/arcfour/Makefile # +# Copyright 2014 Garrett D'Amore +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,9 +50,6 @@ ROOTMODULE = $(ROOT_PSM_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sun4v/Makefile.sun4v -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # -- 2.11.4.GIT