diff options
| author | Wyllys Ingersoll <wyllys.ingersoll@sun.com> | 2009-07-02 15:06:50 -0700 |
|---|---|---|
| committer | Wyllys Ingersoll <wyllys.ingersoll@sun.com> | 2009-07-02 15:06:50 -0700 |
| commit | a398035bff356df3a17376cda89486682fb1f23b (patch) | |
| tree | 30cf29063ab31b7a83c4d691e6e0cb1365247173 /usr/src | |
| parent | dd9e16da4243358c2e9251a4ca5d50f56e0adc68 (diff) | |
| download | illumos-gate-a398035bff356df3a17376cda89486682fb1f23b.tar.gz | |
6855407 kernel crypto module reports firmware version incorrectly
6854979 kmf_pkcs11.so.1 has bad SONAME and versioning
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/crypto/io/crypto.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index c2727b0e1f..c6182dde43 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -51,7 +51,6 @@ CPPFLAGS += -D_REENTRANT $(KMFINC) \ -I$(INCDIR) -I/usr/include/libxml2 PICS= $(OBJECTS:%=pics/%) -SONAME= $(DYNLIB) lint:= OPENSSLLIBS= $(LINTSSLLIBS) lint:= OPENSSLLIBS64= $(LINTSSLLIBS64) diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com index dadce8e5a1..e748463a41 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com @@ -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 @@ CPPFLAGS += -D_REENTRANT $(KMFINC) -I$(INCDIR) -I/usr/include/libxml2 -I$(BIGNU LINTFLAGS64 += -errchk=longptr64 PICS= $(OBJECTS:%=pics/%) -SONAME= $(PLUGIN) LDLIBS += $(PKCS11LIBS) diff --git a/usr/src/uts/common/crypto/io/crypto.c b/usr/src/uts/common/crypto/io/crypto.c index 5f5df7de7e..f41d272c41 100644 --- a/usr/src/uts/common/crypto/io/crypto.c +++ b/usr/src/uts/common/crypto/io/crypto.c @@ -1345,6 +1345,8 @@ ext_to_provider_data(int mode, kcf_provider_desc_t *provider, 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); |