summaryrefslogtreecommitdiff
path: root/usr/src/lib/pkcs11
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-03-08 17:40:00 +0000
committerJohn Levon <john.levon@joyent.com>2019-05-03 02:15:58 -0700
commit3eca610387779e26c8c63e26d2ba418b0cd1bf5a (patch)
tree11359001bf90df8b1a0d2fefd2185c3405f52daa /usr/src/lib/pkcs11
parent5bb525f494c825f138113d51f2ba7acf185093f3 (diff)
downloadillumos-joyent-3eca610387779e26c8c63e26d2ba418b0cd1bf5a.tar.gz
10816 ctf_dwarf_convert_type() relies on un-initialized id
10817 ctfconvert -i option is mis-handled 10818 Improve ctfconvert error messages 10819 ctfconvert should handle empty dies 10820 ctfconvert -i never converts 10821 bad free in ctf_dwarf_init_die 10815 shouldn't build gcore.c as part of kmdb Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/lib/pkcs11')
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile11
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile4
2 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
index 1d184f528a..5fdac2dd0c 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
@@ -22,9 +22,8 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2017 Jason King
-# Copyright (c) 2018, Joyent, Inc.
+# Copyright (c) 2019, Joyent, Inc.
#
-# Copyright (c) 2018, Joyent, Inc.
LIBRARY = libsoftcrypto.a
VERS = .1
@@ -87,7 +86,7 @@ pics/%.o: $(AES_DIR)/$(MACH64)/%.c
pics/%.o: $(AES_DIR)/$(MACH64)/%.s
$(COMPILE.s) $(AES_FLAGS) -o $@ $<
- $(POST_PROCESS_O)
+ $(POST_PROCESS_S_O)
pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.c
$(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $<
@@ -95,11 +94,11 @@ pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.c
pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.s
$(COMPILE64.s) $(BIGNUM_FLAGS) -o $@ $<
- $(POST_PROCESS_O)
+ $(POST_PROCESS_S_O)
pics/%.o: $(MODES_DIR)/$(MACH64)/%.s
$(COMPILE64.s) $(MODES_FLAGS) -o $@ $<
- $(POST_PROCESS_O)
+ $(POST_PROCESS_S_O)
include ../Makefile.targ
@@ -108,4 +107,4 @@ arcfour-x86_64.s: $(ARCFOUR_DIR)/amd64/arcfour-x86_64.pl
pics/%.o: arcfour-x86_64.s
$(COMPILE64.s) $(ARCFOUR_FLAGS) -o $@ $<
- $(POST_PROCESS_O)
+ $(POST_PROCESS_S_O)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile
index 87f618b38a..dda85c9669 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile
@@ -22,6 +22,8 @@
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
+# Copyright (c) 2019, Joyent, Inc.
+#
BIGNUM_PSM_OBJS = bignum_i386.o bignum_i386_asm.o
@@ -53,4 +55,4 @@ pics/bignum_i386.o: $(BIGNUM_DIR)/i386/bignum_i386.c
pics/bignum_i386_asm.o: $(BIGNUM_DIR)/i386/bignum_i386_asm.s
$(COMPILE.s) -o $@ $(BIGNUM_DIR)/i386/bignum_i386_asm.s
- $(POST_PROCESS_O)
+ $(POST_PROCESS_S_O)