diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2014-05-15 10:28:03 +0400 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2014-05-19 07:55:53 -0700 |
| commit | a65cd518c5d0f30c53594a7022eb0f7d04c98cef (patch) | |
| tree | 3fd8815f466051e2274f7d101fd52885606a4366 /usr/src/lib/libpkg | |
| parent | 60b43c45a204a6c0651e8017e1e505015ba74094 (diff) | |
| download | illumos-joyent-a65cd518c5d0f30c53594a7022eb0f7d04c98cef.tar.gz | |
4853 illumos-gate is not lint-clean when built with openssl 1.0
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/lib/libpkg')
| -rw-r--r-- | usr/src/lib/libpkg/Makefile.com | 6 | ||||
| -rw-r--r-- | usr/src/lib/libpkg/common/security.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com index 8f56a61423..50f8dcd6e7 100644 --- a/usr/src/lib/libpkg/Makefile.com +++ b/usr/src/lib/libpkg/Makefile.com @@ -64,7 +64,11 @@ $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LIBS = $(DYNLIB) $(LINTLIB) -LDLIBS += -lc -lssl -lwanboot -lcrypto -lscf -ladm +LDLIBS += -lc -lwanboot -lscf -ladm + +# libcrypto and libssl have no lint library, and so can only be used when +# building +$(DYNLIB) := LDLIBS += -lcrypto -lssl CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/lib/libpkg/common/security.c b/usr/src/lib/libpkg/common/security.c index 9f2070c0c6..4210ba5c32 100644 --- a/usr/src/lib/libpkg/common/security.c +++ b/usr/src/lib/libpkg/common/security.c @@ -110,7 +110,6 @@ get_cert_chain(PKG_ERR *err, X509 *cert, STACK_OF(X509) *clcerts, /* add all ca certs into the store */ for (i = 0; i < sk_X509_num(cas); i++) { - /* LINTED pointer cast may result in improper alignment */ ca_cert = sk_X509_value(cas, i); if (X509_STORE_add_cert(ca_store, ca_cert) == 0) { pkgerr_add(err, PKGERR_NOMEM, gettext(ERR_MEM)); @@ -174,8 +173,7 @@ char NID_commonName, sname, ATTR_MAX) <= 0) { (void) strncpy(sname, - X509_NAME_oneline(xname, - NULL, 0), ATTR_MAX); + X509_NAME_oneline(xname, NULL, 0), ATTR_MAX); sname[ATTR_MAX - 1] = '\0'; } return (sname); @@ -205,8 +203,7 @@ char NID_commonName, sname, ATTR_MAX) <= 0) { (void) strncpy(sname, - X509_NAME_oneline(xname, - NULL, 0), ATTR_MAX); + X509_NAME_oneline(xname, NULL, 0), ATTR_MAX); sname[ATTR_MAX - 1] = '\0'; } return (sname); |