5591 initialisation inversion of component order in cmd-crypto/elfsign.c

5620 cstyle updates for cmd/cmd-crypto and lib/libkmf
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: David Höppner <0xffea@gmail.com>
Reviewed by: Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Approved by: Dan McDonald <danmcd@omniti.com>

8 files changed, 44 insertions, 44 deletions

diff --git a/usr/src/lib/libkmf/libkmf/common/certgetsetop.c b/usr/src/lib/libkmf/libkmf/common/certgetsetop.c
index 40cde1657b..167df96507 100644
--- a/usr/src/lib/libkmf/libkmf/common/certgetsetop.c
+++ b/usr/src/lib/libkmf/libkmf/common/certgetsetop.c
@@ -1656,7 +1656,7 @@ KMF_RETURN
 kmf_get_cert_id_str(const KMF_DATA *SignedCert,	char **idstr)
 {
 	KMF_RETURN ret;
-	KMF_DATA ID = {NULL, 0};
+	KMF_DATA ID = { 0, NULL };
 	char tmpstr[256];
 	int i;
 
@@ -1759,7 +1759,7 @@ kmf_set_cert_pubkey(KMF_HANDLE_T handle,
 	KMF_RETURN ret = KMF_OK;
 	KMF_X509_SPKI *spki_ptr;
 	KMF_PLUGIN *plugin;
-	KMF_DATA KeyData = {NULL, 0};
+	KMF_DATA KeyData = { 0, NULL };
 
 	CLEAR_ERROR(handle, ret);
 	if (ret != KMF_OK)
diff --git a/usr/src/lib/libkmf/libkmf/common/certop.c b/usr/src/lib/libkmf/libkmf/common/certop.c
index f5ea79845a..77cb1e949b 100644
--- a/usr/src/lib/libkmf/libkmf/common/certop.c
+++ b/usr/src/lib/libkmf/libkmf/common/certop.c
@@ -513,7 +513,7 @@ kmf_sign_cert(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 	KMF_DATA *signer_cert = NULL;
 	KMF_DATA *tbs_cert = NULL;  /* to be signed cert */
 	KMF_DATA *signed_cert = NULL;
-	KMF_DATA unsignedCert = {NULL, 0};
+	KMF_DATA unsignedCert = { 0, NULL };
 	KMF_KEY_HANDLE sign_key, *sign_key_ptr;
 	int freethekey = 0;
 	KMF_POLICY_RECORD *policy;
@@ -666,7 +666,7 @@ kmf_sign_data(KMF_HANDLE_T handle, int numattr,
 	KMF_DATA *output = NULL;
 	KMF_KEY_HANDLE sign_key, *sign_key_ptr;
 	KMF_ALGORITHM_INDEX AlgId = KMF_ALGID_NONE;
-	KMF_DATA	signature = {0, NULL};
+	KMF_DATA	signature = { 0, NULL };
 	KMF_OID *oid;
 	KMF_POLICY_RECORD *policy;
 
@@ -831,7 +831,7 @@ kmf_verify_data(KMF_HANDLE_T handle,
 	KMF_PLUGIN *plugin;
 	KMF_KEYSTORE_TYPE kstype;
 	uint32_t len;
-	KMF_DATA	derkey = {0, NULL};
+	KMF_DATA	derkey = { 0, NULL };
 	KMF_KEY_HANDLE *KMFKey;
 	KMF_ALGORITHM_INDEX sigAlg = KMF_ALGID_NONE;
 	KMF_DATA *indata;
@@ -983,7 +983,7 @@ KMF_RETURN
 kmf_verify_cert(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 {
 	KMF_RETURN	ret;
-	KMF_DATA	derkey = {0, NULL};
+	KMF_DATA	derkey = { 0, NULL };
 	KMF_PLUGIN	*plugin;
 	KMF_KEY_HANDLE *KMFKey;
 	KMF_DATA *CertToBeVerified;
@@ -2128,7 +2128,7 @@ find_issuer_cert(KMF_HANDLE_T handle, KMF_KEYSTORE_TYPE *kstype,
 	time_t t_notbefore;
 	time_t t_notafter;
 	time_t latest;
-	KMF_DATA tmp_cert = {0, NULL};
+	KMF_DATA tmp_cert = { 0, NULL };
 	KMF_ATTRIBUTE fc_attrlist[16];
 	int fc_numattr = 0;
 	char *dir = "./";
@@ -2397,8 +2397,8 @@ kmf_validate_cert(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 	char *slotlabel = NULL;
 	char *dirpath = NULL;
 	KMF_DATA *ocsp_response = NULL;
-	KMF_DATA ta_cert = {0, NULL};
-	KMF_DATA issuer_cert = {0, NULL};
+	KMF_DATA ta_cert = { 0, NULL };
+	KMF_DATA issuer_cert = { 0, NULL };
 	char *user_issuer = NULL, *user_subject = NULL;
 	KMF_X509_NAME user_issuerDN, user_subjectDN;
 	boolean_t	self_signed = B_FALSE;
@@ -2650,7 +2650,7 @@ kmf_create_cert_file(const KMF_DATA *certdata, KMF_ENCODE_FORMAT format,
 {
 	KMF_RETURN rv = KMF_OK;
 	int fd = -1;
-	KMF_DATA pemdata = {NULL, 0};
+	KMF_DATA pemdata = { 0, NULL };
 
 	if (certdata == NULL || certfile == NULL)
 		return (KMF_ERR_BAD_PARAMETER);
@@ -2708,7 +2708,7 @@ kmf_is_cert_data(KMF_DATA *data, KMF_ENCODE_FORMAT *fmt)
 {
 	KMF_RETURN rv = KMF_OK;
 	KMF_X509_CERTIFICATE *x509 = NULL;
-	KMF_DATA oldpem = {0, NULL};
+	KMF_DATA oldpem = { 0, NULL };
 	uchar_t *d = NULL;
 	int len = 0;
 
@@ -3005,8 +3005,8 @@ sign_cert(KMF_HANDLE_T handle,
 	KMF_DATA	*SignedCert)
 {
 	KMF_X509_CERTIFICATE	*subj_cert = NULL;
-	KMF_DATA		data_to_sign = {0, NULL};
-	KMF_DATA		signed_data = {0, NULL};
+	KMF_DATA		data_to_sign = { 0, NULL };
+	KMF_DATA		signed_data = { 0, NULL };
 	KMF_RETURN		ret = KMF_OK;
 	KMF_ALGORITHM_INDEX	algid;
 	int i = 0;
@@ -3164,8 +3164,8 @@ verify_cert_with_key(KMF_HANDLE_T handle,
 	KMF_RETURN ret = KMF_OK;
 	KMF_X509_CERTIFICATE *signed_cert = NULL;
 	KMF_X509_SPKI	spki;
-	KMF_DATA	data_to_verify = {0, NULL};
-	KMF_DATA	signed_data = {0, NULL};
+	KMF_DATA	data_to_verify = { 0, NULL };
+	KMF_DATA	signed_data = { 0, NULL };
 	KMF_DATA	signature = { 0, NULL };
 	KMF_ALGORITHM_INDEX	algid;
 
@@ -3255,8 +3255,8 @@ verify_cert_with_cert(KMF_HANDLE_T handle,
 	KMF_RETURN ret = KMF_OK;
 	KMF_X509_CERTIFICATE *SignerCert = NULL;
 	KMF_X509_CERTIFICATE *ToBeVerifiedCert = NULL;
-	KMF_DATA	data_to_verify = {0, NULL};
-	KMF_DATA	signed_data = {0, NULL};
+	KMF_DATA	data_to_verify = { 0, NULL };
+	KMF_DATA	signed_data = { 0, NULL };
 	KMF_DATA	signature;
 	KMF_ALGORITHM_INDEX	algid;
 	KMF_POLICY_RECORD	*policy;
diff --git a/usr/src/lib/libkmf/libkmf/common/csrcrlop.c b/usr/src/lib/libkmf/libkmf/common/csrcrlop.c
index 165fce83d4..e3f447ab0c 100644
--- a/usr/src/lib/libkmf/libkmf/common/csrcrlop.c
+++ b/usr/src/lib/libkmf/libkmf/common/csrcrlop.c
@@ -70,7 +70,7 @@ kmf_set_csr_pubkey(KMF_HANDLE_T handle,
 	KMF_RETURN ret;
 	KMF_X509_SPKI *spki_ptr;
 	KMF_PLUGIN *plugin;
-	KMF_DATA KeyData = {NULL, 0};
+	KMF_DATA KeyData = { 0, NULL };
 
 	CLEAR_ERROR(handle, ret);
 	if (ret != KMF_OK)
@@ -137,7 +137,7 @@ kmf_create_csr_file(KMF_DATA *csrdata, KMF_ENCODE_FORMAT format,
 {
 	KMF_RETURN rv = KMF_OK;
 	int fd = -1;
-	KMF_DATA pemdata = {NULL, 0};
+	KMF_DATA pemdata = { 0, NULL };
 
 	if (csrdata == NULL || csrfile == NULL)
 		return (KMF_ERR_BAD_PARAMETER);
@@ -366,7 +366,7 @@ sign_csr(KMF_HANDLE_T handle,
 {
 	KMF_CSR_DATA	subj_csr;
 	KMF_TBS_CSR	*tbs_csr = NULL;
-	KMF_DATA	signed_data = {0, NULL};
+	KMF_DATA	signed_data = { 0, NULL };
 	KMF_RETURN	ret = KMF_OK;
 	KMF_ATTRIBUTE	attlist[5];
 	KMF_ALGORITHM_INDEX algid;
@@ -500,7 +500,7 @@ kmf_sign_csr(KMF_HANDLE_T handle,
 	KMF_DATA	*SignedCsr)
 {
 	KMF_RETURN err;
-	KMF_DATA csrdata = { NULL, 0 };
+	KMF_DATA csrdata = { 0, NULL };
 
 	CLEAR_ERROR(handle, err);
 	if (err != KMF_OK)
diff --git a/usr/src/lib/libkmf/libkmf/common/generalop.c b/usr/src/lib/libkmf/libkmf/common/generalop.c
index da3ff15652..e29eaddf5d 100644
--- a/usr/src/lib/libkmf/libkmf/common/generalop.c
+++ b/usr/src/lib/libkmf/libkmf/common/generalop.c
@@ -990,7 +990,7 @@ KMF_RETURN
 kmf_get_file_format(char *filename, KMF_ENCODE_FORMAT *fmt)
 {
 	KMF_RETURN ret = KMF_OK;
-	KMF_DATA filebuf = {NULL, 0};
+	KMF_DATA filebuf = { 0, NULL };
 
 	if (filename == NULL || !strlen(filename) || fmt == NULL)
 		return (KMF_ERR_BAD_PARAMETER);
@@ -2168,7 +2168,7 @@ kmf_set_altname(KMF_X509_EXTENSIONS *extensions,
 {
 	KMF_RETURN ret = KMF_OK;
 	KMF_X509_EXTENSION subjAltName;
-	KMF_DATA dername = { NULL, 0 };
+	KMF_DATA dername = { 0, NULL };
 	BerElement *asn1 = NULL;
 	BerValue *extdata;
 	char *olddata = NULL;
diff --git a/usr/src/lib/libkmf/libkmf/common/pk11keys.c b/usr/src/lib/libkmf/libkmf/common/pk11keys.c
index df2cd0f8df..015cd8a14c 100644
--- a/usr/src/lib/libkmf/libkmf/common/pk11keys.c
+++ b/usr/src/lib/libkmf/libkmf/common/pk11keys.c
@@ -446,7 +446,7 @@ PKCS_VerifyData(KMF_HANDLE_T handle,
 	CK_ATTRIBUTE	subprime = { CKA_SUBPRIME, NULL, 0 };
 	CK_BYTE		*dataptr;
 	CK_ULONG	datalen;
-	KMF_DATA	hashData = {NULL, 0};
+	KMF_DATA	hashData = { 0, NULL };
 	uchar_t		digest[1024];
 
 	if (AlgorithmId == KMF_ALGID_NONE)
diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c b/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c
index 8a0e6ba862..a710efca8b 100644
--- a/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c
@@ -1608,7 +1608,7 @@ p12u_ucs2_ascii_conversion_function(
 	unsigned int	*outBufLen,
 	PRBool		swapBytes)
 {
-	SECItem it = { 0 };
+	SECItem it = { siBuffer, NULL, 0 };
 	SECItem *dup = NULL;
 	PRBool ret;
 
@@ -1774,7 +1774,7 @@ NSS_ExportPK12(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 	CERTCertificate *nsscert = NULL;
 	CERTCertListNode* node = NULL;
 	PK11SlotInfo	*slot = NULL;
-	SECItem pwitem = {NULL, 0};
+	SECItem pwitem = { siBuffer, NULL, 0 };
 	KMF_CREDENTIAL *cred = NULL;
 	KMF_CREDENTIAL *p12cred = NULL;
 	char *certlabel = NULL;
@@ -2144,12 +2144,12 @@ NSS_StoreKey(KMF_HANDLE_T handle,
 	KMF_RETURN rv = KMF_OK;
 	KMF_HANDLE *kmfh = (KMF_HANDLE *)handle;
 	PK11SlotInfo *nss_slot = NULL;
-	KMF_CREDENTIAL cred = {NULL, 0};
+	KMF_CREDENTIAL cred = { NULL, 0 };
 	KMF_KEY_HANDLE *pubkey = NULL, *prikey = NULL;
 	KMF_RAW_KEY_DATA *rawkey = NULL;
 	char *keylabel = NULL;
 	SECStatus ckrv = SECSuccess;
-	SECItem nickname = {NULL, 0};
+	SECItem nickname = { siBuffer, NULL, 0 };
 	CERTCertificate *nss_cert = NULL;
 
 	if (kmfh == NULL || attrlist == NULL || numattr == 0) {
@@ -2195,7 +2195,7 @@ NSS_StoreKey(KMF_HANDLE_T handle,
 	if (rawkey != NULL) {
 		uchar_t ver = 0;
 		SECKEYPrivateKeyInfo rpk;
-		KMF_DATA derkey = {NULL, 0};
+		KMF_DATA derkey = { 0, NULL };
 		KMF_DATA *cert;
 
 		cert = kmf_get_attr_ptr(KMF_CERT_DATA_ATTR, attrlist, numattr);
@@ -2393,8 +2393,8 @@ NSS_ImportCert(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 {
 	KMF_RETURN ret = KMF_OK;
 	PK11SlotInfo *nss_slot = NULL;
-	KMF_DATA cert = {NULL, 0};
-	KMF_DATA cert_der = {NULL, 0};
+	KMF_DATA cert = { 0, NULL };
+	KMF_DATA cert_der = { 0, NULL };
 	KMF_DATA *cptr = NULL;
 	KMF_ENCODE_FORMAT format;
 	char *label = NULL;
@@ -2870,7 +2870,7 @@ NSS_FindCertInCRL(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 		cert = CERT_FindCertByNicknameOrEmailAddr(certHandle,
 		    certlabel);
 	} else {
-		SECItem derCert = { NULL, 0};
+		SECItem derCert = { siBuffer, NULL, 0 };
 
 		certdata = kmf_get_attr_ptr(KMF_CERT_DATA_ATTR,
 		    attrlist, numattr);
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 fc3da4b7e8..0786a26e8b 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
@@ -1264,7 +1264,7 @@ OpenSSL_DeleteCert(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 {
 	KMF_RETURN rv;
 	KMF_HANDLE *kmfh = (KMF_HANDLE *)handle;
-	KMF_DATA certdata = {NULL, 0};
+	KMF_DATA certdata = { 0, NULL };
 	char *dirpath = NULL;
 	char *filename = NULL;
 	char *fullpath = NULL;
@@ -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);
@@ -4865,7 +4865,7 @@ OpenSSL_StoreKey(KMF_HANDLE_T handle, int numattr,
 	KMF_RAW_KEY_DATA *rawkey;
 	EVP_PKEY *pkey = NULL;
 	KMF_ENCODE_FORMAT format = KMF_FORMAT_PEM;
-	KMF_CREDENTIAL cred = {NULL, 0};
+	KMF_CREDENTIAL cred = { NULL, 0 };
 	BIO *out = NULL;
 	int keys = 0;
 	char *fullpath = NULL;
diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c
index 7a93af269e..e36085ad03 100644
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c
@@ -1264,8 +1264,8 @@ KMFPK11_ImportCert(KMF_HANDLE_T handle, int numattr, KMF_ATTRIBUTE *attrlist)
 	char *label = NULL;
 	KMF_ENCODE_FORMAT format;
 	KMF_CREDENTIAL *cred = NULL;
-	KMF_DATA  cert1 = { NULL, 0};
-	KMF_DATA  cert2 = { NULL, 0};
+	KMF_DATA  cert1 = { 0, NULL };
+	KMF_DATA  cert2 = { 0, NULL };
 
 	if (kmfh == NULL)
 		return (KMF_ERR_UNINITIALIZED);
@@ -2010,7 +2010,7 @@ KMFPK11_SignData(KMF_HANDLE_T handle, KMF_KEY_HANDLE *keyp,
 	CK_MECHANISM_TYPE	mechtype, hashmech;
 	CK_KEY_TYPE		keytype;
 	KMF_ALGORITHM_INDEX	AlgId;
-	KMF_DATA		hashData = {NULL, 0};
+	KMF_DATA		hashData = { 0, NULL };
 	uchar_t			digest[1024];
 	CK_ATTRIBUTE		subprime = { CKA_SUBPRIME, NULL, 0 };
 
@@ -2180,7 +2180,7 @@ KMFPK11_FindPrikeyByCert(KMF_HANDLE_T handle, int numattr,
 	CK_ULONG obj_count;
 	CK_OBJECT_CLASS objClass = CKO_PRIVATE_KEY;
 	CK_BBOOL true = TRUE;
-	KMF_DATA Id = { NULL, 0 };
+	KMF_DATA Id = { 0, NULL };
 	KMF_KEY_HANDLE *key = NULL;
 	KMF_DATA *cert = NULL;
 	KMF_CREDENTIAL cred;
@@ -3000,7 +3000,7 @@ KMFPK11_FindKey(KMF_HANDLE_T handle,
 	idstr = kmf_get_attr_ptr(KMF_IDSTR_ATTR, attrlist, numattr);
 
 	if (idstr != NULL) {
-		KMF_DATA iddata = { NULL, 0 };
+		KMF_DATA iddata = { 0, NULL };
 
 		/*
 		 * ID String parameter is assumed to be of form:
@@ -3198,8 +3198,8 @@ store_raw_key(KMF_HANDLE_T handle,
 	CK_OBJECT_CLASS oClass = CKO_PRIVATE_KEY;
 	CK_BBOOL	cktrue = TRUE;
 	CK_DATE		startdate, enddate;
-	KMF_DATA	id = {NULL, 0};
-	KMF_DATA	subject = {NULL, 0};
+	KMF_DATA	id = { 0, NULL };
+	KMF_DATA	subject = { 0, NULL };
 	KMF_X509EXT_KEY_USAGE kuext;
 	KMF_X509_CERTIFICATE *x509 = NULL;
 	CK_BBOOL	kufound = B_FALSE;
@@ -3993,7 +3993,7 @@ KMFPK11_StoreKey(KMF_HANDLE_T handle,
 {
 	KMF_RETURN rv = KMF_OK;
 	KMF_HANDLE *kmfh = (KMF_HANDLE *)handle;
-	KMF_CREDENTIAL cred = {NULL, 0};
+	KMF_CREDENTIAL cred = { NULL, 0 };
 	KMF_KEY_HANDLE *key;
 	KMF_RAW_KEY_DATA *rawkey = NULL;
 	CK_BBOOL btrue = TRUE;