diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2015-05-04 14:17:28 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-05-05 12:02:29 -0400 |
| commit | 37bbd7cc85ebfd31fbf68569b8b098e5448c9ce9 (patch) | |
| tree | 553680f7cca62f4b4f4cfecdc71e74b2ced08a90 /usr/src/lib/libkmf | |
| parent | f949c3862e64cd157f2a1aeefd0da08100f76173 (diff) | |
| download | illumos-gate-37bbd7cc85ebfd31fbf68569b8b098e5448c9ce9.tar.gz | |
5878 Additional lint fixes for sunstudio12.1 and more modern OpenSSL
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
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 76ecd38479..9557d11286 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) -lcrypto -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); } |