diff options
| author | Robert Mustacchi <rm@joyent.com> | 2014-05-20 13:23:20 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2014-05-20 15:32:05 -0700 |
| commit | d7141854234c22ab8fe0547bf51a2f3a30781870 (patch) | |
| tree | b4598795c57d0dfaea8c08c4aba3d00569326900 /usr/src/lib/libpkg | |
| parent | 826ac02a0def83e0a41b29321470d299c7389aab (diff) | |
| download | illumos-joyent-d7141854234c22ab8fe0547bf51a2f3a30781870.tar.gz | |
backout 4853: breaks lint
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, 6 insertions, 7 deletions
diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com index 50f8dcd6e7..8f56a61423 100644 --- a/usr/src/lib/libpkg/Makefile.com +++ b/usr/src/lib/libpkg/Makefile.com @@ -64,11 +64,7 @@ $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LIBS = $(DYNLIB) $(LINTLIB) -LDLIBS += -lc -lwanboot -lscf -ladm - -# libcrypto and libssl have no lint library, and so can only be used when -# building -$(DYNLIB) := LDLIBS += -lcrypto -lssl +LDLIBS += -lc -lssl -lwanboot -lcrypto -lscf -ladm 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 4210ba5c32..9f2070c0c6 100644 --- a/usr/src/lib/libpkg/common/security.c +++ b/usr/src/lib/libpkg/common/security.c @@ -110,6 +110,7 @@ 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)); @@ -173,7 +174,8 @@ 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); @@ -203,7 +205,8 @@ 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); |