Mercurial > illumos > illumos-gate
changeset 10028:2de34ea54ad5
6855407 kernel crypto module reports firmware version incorrectly
6854979 kmf_pkcs11.so.1 has bad SONAME and versioning
| author | Wyllys Ingersoll <wyllys.ingersoll@sun.com> |
|---|---|
| date | Thu, 02 Jul 2009 15:06:50 -0700 |
| parents | c95796758397 |
| children | 8377504a53e1 |
| files | usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com usr/src/uts/common/crypto/io/crypto.c |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com Thu Jul 02 14:17:43 2009 -0700 +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com Thu Jul 02 15:06:50 2009 -0700 @@ -51,7 +51,6 @@ -I$(INCDIR) -I/usr/include/libxml2 PICS= $(OBJECTS:%=pics/%) -SONAME= $(DYNLIB) lint:= OPENSSLLIBS= $(LINTSSLLIBS) lint:= OPENSSLLIBS64= $(LINTSSLLIBS64)
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com Thu Jul 02 14:17:43 2009 -0700 +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com Thu Jul 02 15:06:50 2009 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Makefile for KMF Plugins @@ -53,7 +53,6 @@ LINTFLAGS64 += -errchk=longptr64 PICS= $(OBJECTS:%=pics/%) -SONAME= $(PLUGIN) LDLIBS += $(PKCS11LIBS)
--- a/usr/src/uts/common/crypto/io/crypto.c Thu Jul 02 14:17:43 2009 -0700 +++ b/usr/src/uts/common/crypto/io/crypto.c Thu Jul 02 15:06:50 2009 -0700 @@ -1345,6 +1345,8 @@ STRUCT_FSET(version, cv_minor, ei->ei_hardware_version.cv_minor); bcopy(STRUCT_BUF(version), STRUCT_FADDR(pd, pd_hardware_version), STRUCT_SIZE(version)); + STRUCT_FSET(version, cv_major, ei->ei_firmware_version.cv_major); + STRUCT_FSET(version, cv_minor, ei->ei_firmware_version.cv_minor); bcopy(STRUCT_BUF(version), STRUCT_FADDR(pd, pd_firmware_version), STRUCT_SIZE(version)); bcopy(ei->ei_time, STRUCT_FGET(pd, pd_time), CRYPTO_EXT_SIZE_TIME);