summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com4
-rw-r--r--usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c20
-rw-r--r--usr/src/lib/libnsl/key/publickey.c5
-rw-r--r--usr/src/lib/libnsl/nsl/t_sndvudata.c16
-rw-r--r--usr/src/lib/libnsl/nss/getexecattr.c30
-rw-r--r--usr/src/lib/libnsl/rpc/clnt_vc.c2
-rw-r--r--usr/src/lib/libnsl/rpc/netnamer.c4
-rw-r--r--usr/src/lib/libpkg/Makefile.com6
-rw-r--r--usr/src/lib/libpkg/common/security.c7
-rw-r--r--usr/src/lib/libwanboot/Makefile.com7
-rw-r--r--usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com7
11 files changed, 62 insertions, 46 deletions
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
index 3ba997f3d8..42e2d976fd 100644
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
@@ -40,8 +40,8 @@ BERLIB64= $(BERLIB)
OPENSSLLIBS= $(BERLIB) -lsunw_crypto -lcryptoutil -lc
OPENSSLLIBS64= $(BERLIB64) -lsunw_crypto -lcryptoutil -lc
-LINTSSLLIBS = $(BERLIB) -lcryptoutil -lc
-LINTSSLLIBS64 = $(BERLIB64) -lcryptoutil -lc
+LINTSSLLIBS = $(BERLIB) -lcrypto -lcryptoutil -lc
+LINTSSLLIBS64 = $(BERLIB64) -lcrypto -lcryptoutil -lc
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 19d757df90..fc3da4b7e8 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
@@ -2033,7 +2033,7 @@ OpenSSL_CertGetPrintable(KMF_HANDLE_T handle, const KMF_DATA *pcert,
#if OPENSSL_VERSION_NUMBER < 0x10000000L
STACK *emlst = NULL;
#else
- STACK_OF(OPENSSL_STRING) *emlst = NULL;
+ STACK_OF(OPENSSL_STRING) *emlst = NULL;
#endif
X509_EXTENSION *ex;
X509_CINF *ci;
@@ -2153,7 +2153,7 @@ OpenSSL_CertGetPrintable(KMF_HANDLE_T handle, const KMF_DATA *pcert,
#else
for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
(void) BIO_printf(mem, "%s\n",
- sk_OPENSSL_STRING_value(emlst, j));
+ sk_OPENSSL_STRING_value(emlst, j));
#endif
len = BIO_gets(mem, resultStr, KMF_CERT_PRINTABLE_LEN);
@@ -2499,6 +2499,7 @@ static X509 *ocsp_find_signer_sk(STACK_OF(X509) *certs, OCSP_RESPID *id)
keyhash = id->value.byKey->data;
/* Calculate hash of each key and compare */
for (i = 0; i < sk_X509_num(certs); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
X509 *x = sk_X509_value(certs, i);
/* Use pubkey_digest to get the key ID value */
(void) X509_pubkey_digest(x, EVP_sha1(), tmphash, NULL);
@@ -3638,6 +3639,7 @@ extract_pem(KMF_HANDLE *kmfh,
}
for (i = 0; i < sk_X509_INFO_num(x509_info_stack); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
cert_infos[ncerts] = sk_X509_INFO_value(x509_info_stack, i);
ncerts++;
}
@@ -3719,6 +3721,7 @@ extract_pem(KMF_HANDLE *kmfh,
err:
/* Cleanup the stack of X509 info records */
for (i = 0; i < sk_X509_INFO_num(x509_info_stack); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
info = (X509_INFO *)sk_X509_INFO_value(x509_info_stack, i);
X509_INFO_free(info);
}
@@ -3739,6 +3742,7 @@ openssl_parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, char *pin,
int i;
for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
PKCS12_SAFEBAG *bag = sk_PKCS12_SAFEBAG_value(bags, i);
ret = openssl_parse_bag(bag, pin, (pin ? strlen(pin) : 0),
keys, certs);
@@ -3769,10 +3773,12 @@ set_pkey_attrib(EVP_PKEY *pkey, ASN1_TYPE *attrib, int nid)
X509_ATTRIBUTE *a;
for (i = 0;
i < sk_X509_ATTRIBUTE_num(pkey->attributes); i++) {
+ /* LINTED E_BAD_PTR_CASE_ALIGN */
a = sk_X509_ATTRIBUTE_value(pkey->attributes, i);
if (OBJ_obj2nid(a->object) == nid) {
X509_ATTRIBUTE_free(a);
- (void) sk_X509_ATTRIBUTE_set(pkey->attributes,
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
+ sk_X509_ATTRIBUTE_set(pkey->attributes,
i, attr);
return (KMF_OK);
}
@@ -3949,6 +3955,7 @@ openssl_pkcs12_parse(PKCS12 *p12, char *pin,
for (i = 0; ret == KMF_OK && i < sk_PKCS7_num(asafes); i++) {
bags = NULL;
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
p7 = sk_PKCS7_value(asafes, i);
bagnid = OBJ_obj2nid(p7->type);
@@ -4226,6 +4233,7 @@ find_attr(STACK_OF(X509_ATTRIBUTE) *attrs, int nid)
return (NULL);
for (i = 0; i < sk_X509_ATTRIBUTE_num(attrs); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
a = sk_X509_ATTRIBUTE_value(attrs, i);
if (OBJ_obj2nid(a->object) == nid)
return (a);
@@ -4266,6 +4274,7 @@ convertToRawKey(EVP_PKEY *pkey, KMF_RAW_KEY_DATA *key)
ASN1_TYPE *ty = NULL;
int numattr = sk_ASN1_TYPE_num(attr->value.set);
if (attr->single == 0 && numattr > 0) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
ty = sk_ASN1_TYPE_value(attr->value.set, 0);
}
if (ty != NULL) {
@@ -4289,6 +4298,7 @@ convertToRawKey(EVP_PKEY *pkey, KMF_RAW_KEY_DATA *key)
ASN1_TYPE *ty = NULL;
int numattr = sk_ASN1_TYPE_num(attr->value.set);
if (attr->single == 0 && numattr > 0) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
ty = sk_ASN1_TYPE_value(attr->value.set, 0);
}
key->id.Data = (uchar_t *)malloc(
@@ -4319,6 +4329,7 @@ convertPK12Objects(
int i;
for (i = 0; sslkeys != NULL && i < sk_EVP_PKEY_num(sslkeys); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
EVP_PKEY *pkey = sk_EVP_PKEY_value(sslkeys, i);
rv = convertToRawKey(pkey, &key);
if (rv == KMF_OK)
@@ -4330,6 +4341,7 @@ convertPK12Objects(
/* Now add the certificate to the certlist */
for (i = 0; sslcert != NULL && i < sk_X509_num(sslcert); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
X509 *cert = sk_X509_value(sslcert, i);
rv = add_cert_to_list(kmfh, cert, certlist, ncerts);
if (rv != KMF_OK)
@@ -4345,6 +4357,7 @@ convertPK12Objects(
* Lint is complaining about the embedded casting, and
* to fix it, you need to fix openssl header files.
*/
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
c = sk_X509_value(sslcacerts, i);
/* Now add the ca cert to the certlist */
@@ -5411,6 +5424,7 @@ OpenSSL_FindCertInCRL(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
}
for (i = 0; i < sk_X509_REVOKED_num(revoke_stack); i++) {
+ /* LINTED E_BAD_PTR_CAST_ALIGN */
revoke = sk_X509_REVOKED_value(revoke_stack, i);
if (ASN1_INTEGER_cmp(xcert->cert_info->serialNumber,
revoke->serialNumber) == 0) {
diff --git a/usr/src/lib/libnsl/key/publickey.c b/usr/src/lib/libnsl/key/publickey.c
index ffea570d75..7796883fd0 100644
--- a/usr/src/lib/libnsl/key/publickey.c
+++ b/usr/src/lib/libnsl/key/publickey.c
@@ -23,6 +23,9 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/*
+ * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
+ */
/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
@@ -580,6 +583,7 @@ __getpublickey_cached_g(const char netname[], /* in */
syslog(LOG_INFO, "Unknown publickey nameservice '%s'",
look->service_name);
err = __NSW_UNAVAIL;
+ res = 0;
}
switch (look->actions[err]) {
@@ -662,6 +666,7 @@ getsecretkey_g(
syslog(LOG_INFO, "Unknown publickey nameservice '%s'",
look->service_name);
err = __NSW_UNAVAIL;
+ res = 0;
}
switch (look->actions[err]) {
case __NSW_CONTINUE :
diff --git a/usr/src/lib/libnsl/nsl/t_sndvudata.c b/usr/src/lib/libnsl/nsl/t_sndvudata.c
index b6c9d4f602..88a593b0ec 100644
--- a/usr/src/lib/libnsl/nsl/t_sndvudata.c
+++ b/usr/src/lib/libnsl/nsl/t_sndvudata.c
@@ -24,8 +24,9 @@
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-
-#pragma ident "%Z%%M% %I% %E% SMI"
+/*
+ * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
+ */
/*
* t_sndudata.c and t_sndvudata.c are very similar and contain common code.
@@ -56,7 +57,7 @@ _tx_sndvudata(int fd, const struct t_unitdata *unitdata, struct t_iovec *tiov,
struct _ti_user *tiptr;
int sv_errno;
int didalloc;
- char *dataptr;
+ char *dataptr = NULL;
unsigned int nbytes;
assert(api_semantics == TX_XTI_XNS5_API);
@@ -157,7 +158,6 @@ _tx_sndvudata(int fd, const struct t_unitdata *unitdata, struct t_iovec *tiov,
ctlbuf.len = size;
- dataptr = NULL;
if (nbytes != 0) {
if ((dataptr = malloc((size_t)nbytes)) == NULL) {
t_errno = TSYSERR;
@@ -187,13 +187,12 @@ _tx_sndvudata(int fd, const struct t_unitdata *unitdata, struct t_iovec *tiov,
sig_mutex_lock(&tiptr->ti_lock);
_T_TX_NEXTSTATE(T_SNDUDATA, tiptr,
- "t_sndvudata: invalid state event T_SNDUDATA");
+ "t_sndvudata: invalid state event T_SNDUDATA");
if (didalloc)
free(ctlbuf.buf);
else
tiptr->ti_ctlbuf = ctlbuf.buf;
- if (dataptr != NULL)
- free(dataptr);
+ free(dataptr);
sig_mutex_unlock(&tiptr->ti_lock);
return (0);
err_out:
@@ -202,8 +201,7 @@ err_out:
free(ctlbuf.buf);
else
tiptr->ti_ctlbuf = ctlbuf.buf;
- if (dataptr != NULL)
- free(dataptr);
+ free(dataptr);
sig_mutex_unlock(&tiptr->ti_lock);
errno = sv_errno;
return (-1);
diff --git a/usr/src/lib/libnsl/nss/getexecattr.c b/usr/src/lib/libnsl/nss/getexecattr.c
index dca29eeb45..8df3b6a076 100644
--- a/usr/src/lib/libnsl/nss/getexecattr.c
+++ b/usr/src/lib/libnsl/nss/getexecattr.c
@@ -22,6 +22,9 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/*
+ * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
+ */
#include "mt.h"
#include <stdio.h>
@@ -167,36 +170,37 @@ _getexecprof(char *name,
{
int getby_flag;
char policy_buf[BUFSIZ];
- const char *empty = NULL;
nss_status_t res = NSS_NOTFOUND;
nss_XbyY_args_t arg;
_priv_execattr _priv_exec;
static mutex_t _nsw_exec_lock = DEFAULTMUTEX;
+ if ((name != NULL) && (id != NULL)) {
+ getby_flag = NSS_DBOP_EXECATTR_BYNAMEID;
+ } else if (name != NULL) {
+ getby_flag = NSS_DBOP_EXECATTR_BYNAME;
+ } else if (id != NULL) {
+ getby_flag = NSS_DBOP_EXECATTR_BYID;
+ } else {
+ return (NULL);
+ }
+
NSS_XbyY_INIT(&arg, result, buffer, buflen, str2execattr);
- _priv_exec.name = (name == NULL) ? empty : (const char *)name;
- _priv_exec.type = (type == NULL) ? empty : (const char *)type;
- _priv_exec.id = (id == NULL) ? empty : (const char *)id;
+ _priv_exec.name = name;
+ _priv_exec.type = type;
+ _priv_exec.id = id;
#ifdef SI_SECPOLICY
if (sysinfo(SI_SECPOLICY, policy_buf, BUFSIZ) == -1)
#endif /* SI_SECPOLICY */
(void) strncpy(policy_buf, DEFAULT_POLICY, BUFSIZ);
retry_policy:
- _priv_exec.policy = IS_SEARCH_ALL(search_flag) ? empty : policy_buf;
+ _priv_exec.policy = IS_SEARCH_ALL(search_flag) ? NULL : policy_buf;
_priv_exec.search_flag = search_flag;
_priv_exec.head_exec = NULL;
_priv_exec.prev_exec = NULL;
- if ((name != NULL) && (id != NULL)) {
- getby_flag = NSS_DBOP_EXECATTR_BYNAMEID;
- } else if (name != NULL) {
- getby_flag = NSS_DBOP_EXECATTR_BYNAME;
- } else if (id != NULL) {
- getby_flag = NSS_DBOP_EXECATTR_BYID;
- }
-
arg.key.attrp = &(_priv_exec);
switch (getby_flag) {
diff --git a/usr/src/lib/libnsl/rpc/clnt_vc.c b/usr/src/lib/libnsl/rpc/clnt_vc.c
index 0c0fb01037..4f92a3379b 100644
--- a/usr/src/lib/libnsl/rpc/clnt_vc.c
+++ b/usr/src/lib/libnsl/rpc/clnt_vc.c
@@ -907,6 +907,8 @@ clnt_vc_control(CLIENT *cl, int request, char *info)
/* LINTED pointer cast */
ct->ct_blocking_mode: *(int *)info);
ret = (0 == res);
+ } else {
+ ret = FALSE;
}
rpc_fd_unlock(vctbl, ct->ct_fd);
return (ret);
diff --git a/usr/src/lib/libnsl/rpc/netnamer.c b/usr/src/lib/libnsl/rpc/netnamer.c
index 80ce59c358..b257403b70 100644
--- a/usr/src/lib/libnsl/rpc/netnamer.c
+++ b/usr/src/lib/libnsl/rpc/netnamer.c
@@ -23,6 +23,9 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/*
+ * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
+ */
/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
/*
@@ -429,6 +432,7 @@ netname2user(const char netname[MAXNETNAMELEN + 1], uid_t *uidp, gid_t *gidp,
"netname2user: unknown nameservice for publickey"
"info '%s'\n", look->service_name);
err = __NSW_UNAVAIL;
+ res = 0;
}
switch (look->actions[err]) {
case __NSW_CONTINUE :
diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com
index 1d8a658d52..0106d8288f 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 += -lsunw_crypto -lsunw_ssl
+LDLIBS += -lc -lsunw_ssl -lwanboot -lsunw_crypto -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);
diff --git a/usr/src/lib/libwanboot/Makefile.com b/usr/src/lib/libwanboot/Makefile.com
index 350c49e2a9..1e6310f9ba 100644
--- a/usr/src/lib/libwanboot/Makefile.com
+++ b/usr/src/lib/libwanboot/Makefile.com
@@ -60,12 +60,7 @@ include ../../Makefile.lib
LIBS += $(LINTLIB)
LDLIBS += -lnvpair -lresolv -lnsl -lsocket -ldevinfo -ldhcputil \
- -linetutil -lc
-
-# libcrypto and libssl have no lint library, so we can only use it when
-# building
-$(DYNLIB) := LDLIBS += -lsunw_crypto -lsunw_ssl
-
+ -linetutil -lc -lsunw_crypto -lsunw_ssl
CPPFLAGS = -I$(SRC)/common/net/wanboot/crypt $(CPPFLAGS.master)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
index e8433d8087..7345ddc892 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
@@ -73,12 +73,7 @@ TSSLIB=-L$(TSPILIBDIR)
TSSLIB64=-L$(TSPILIBDIR)/$(MACH64)
TSSINC=-I$(TSPIINCDIR)
-LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi
-
-# libcrypto has no lint library, so we can only use it when
-# building
-$(LIBS) := LDLIBS += -lsunw_crypto
-
+LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lsunw_crypto
CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC)
CPPFLAGS64 += $(CPPFLAGS)
C99MODE= $(C99_ENABLE)
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-02 15:52:29 +0000