diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-05-06 14:46:23 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-05-06 14:46:23 +0000 |
| commit | 7e2a10d916a1d4d61a72ec1e4c7ab72081046cb9 (patch) | |
| tree | 76f175759eededd6a43a993ef19a5adcf297788e /usr/src/lib/libkmf | |
| parent | 920a85c54f455969235ca6a627288506e1e172a8 (diff) | |
| parent | 7e89328164e4b89906924cf4e0387ea13a77631b (diff) | |
| download | illumos-joyent-7e2a10d916a1d4d61a72ec1e4c7ab72081046cb9.tar.gz | |
[illumos-gate merge]
commit 7e89328164e4b89906924cf4e0387ea13a77631b
5753 libnsl: set_up_connection() over TCP does not adhere the specified timeout
commit 12844f5a6e6a4f8cb472dc421b8263103c55bd43
5651 Missing header file sys/fs/s5ino.h referenced in /usr/src/cmd/acct/diskusg.c
commit 4d0eb50e691de4c20b1dd9976ad6839fede8a42d
4719 update gate build environment to [open]jdk7
4742 update manifests for javadoc7
4743 Fix deprecated /usr/j2se usage in slp and remove from filesystem(5) manpage
4744 remove traces of /var/sadm/system/admin/default_java
commit 37bbd7cc85ebfd31fbf68569b8b098e5448c9ce9
5878 Additional lint fixes for sunstudio12.1 and more modern OpenSSL
Conflicts:
usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
Diffstat (limited to 'usr/src/lib/libkmf')
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com | 5 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index 42e2d976fd..72432160c7 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -43,6 +43,11 @@ OPENSSLLIBS64= $(BERLIB64) -lsunw_crypto -lcryptoutil -lc LINTSSLLIBS = $(BERLIB) -lcrypto -lcryptoutil -lc LINTSSLLIBS64 = $(BERLIB64) -lcrypto -lcryptoutil -lc +# Because of varying openssl implementations, we need to not have lint +# complain if we're being liberal in our suppression directives. +LINTFLAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED +LINTFLAGS64 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED + SRCDIR= ../common INCDIR= ../../include diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c index 0786a26e8b..1c85c33dc8 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c @@ -3778,7 +3778,7 @@ set_pkey_attrib(EVP_PKEY *pkey, ASN1_TYPE *attrib, int nid) if (OBJ_obj2nid(a->object) == nid) { X509_ATTRIBUTE_free(a); /* LINTED E_BAD_PTR_CAST_ALIGN */ - sk_X509_ATTRIBUTE_set(pkey->attributes, + (void) sk_X509_ATTRIBUTE_set(pkey->attributes, i, attr); return (KMF_OK); } |