Mercurial > unleashed > wips

changeset 19572:85b7b6852d30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
9178 sasl_plugins: this statement may fall through Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk> Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> Approved by: Robert Mustacchi <rm@joyent.com>
author Toomas Soome <tsoome@me.com>
date Tue, 11 Jul 2017 15:35:32 +0300
parents ab9a79c61768
children e0ac0d96c56c
files usr/src/lib/sasl_plugins/digestmd5/digestmd5.c usr/src/lib/sasl_plugins/login/login.c
diffstat 2 files changed, 78 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/sasl_plugins/digestmd5/digestmd5.c	Tue Mar 13 14:16:40 2018 +0200
+++ b/usr/src/lib/sasl_plugins/digestmd5/digestmd5.c	Tue Jul 11 15:35:32 2017 +0300
@@ -1261,7 +1261,7 @@
     CK_OBJECT_CLASS	class = CKO_SECRET_KEY;
     CK_BBOOL		true = TRUE;
     static CK_MECHANISM	mechanism = {CKM_RC4, NULL, 0};
-    unsigned char 	keybuf[24];
+    unsigned char	keybuf[24];
     CK_ATTRIBUTE	template[] = {
 				{CKA_CLASS, NULL, sizeof (class)},
 				{CKA_KEY_TYPE, NULL, sizeof (keyType)},
@@ -1410,7 +1410,7 @@
     uef_context_t	*dec_context =
 		(uef_context_t *)text->cipher_dec_context;
     CK_RV		rv;
-    unsigned char 	buf[1];
+    unsigned char	buf[1];
     CK_ULONG		ulLen = 0;
 
 
@@ -1419,7 +1419,7 @@
 	if (rv != CKR_OK) {
 #ifdef DEBUG
 	    text->utils->log(text->utils->conn, SASL_LOG_DEBUG,
-	    		     "C_EncryptFinal failed:0x%.8X\n", rv);
+			     "C_EncryptFinal failed:0x%.8X\n", rv);
 #endif
 	}
 	rv = C_DestroyObject(enc_context->hSession, enc_context->hKey);
@@ -5091,6 +5091,7 @@
 	}
 
 	/* fall through and respond to challenge */
+	/* FALLTHROUGH */
 
     case 3:
 	if (serverin && !strncasecmp(serverin, "rspauth=", 8)) {
@@ -5121,6 +5122,7 @@
 	text->realm = text->nonce = text->cnonce = NULL;
 #endif /* _SUN_SDK_ */
 	ctext->cipher = NULL;
+	/* FALLTHROUGH */
 
     case 2:
 	return digestmd5_client_mech_step2(ctext, params,
@@ -5173,7 +5175,7 @@
 	SASL_SEC_NOPLAINTEXT
 	| SASL_SEC_NOANONYMOUS
 	| SASL_SEC_MUTUAL_AUTH,		/* security_flags */
-	SASL_FEAT_ALLOWS_PROXY, 	/* features */
+	SASL_FEAT_ALLOWS_PROXY,		/* features */
 	NULL,				/* required_prompts */
 	NULL,				/* glob_context */
 	&digestmd5_client_mech_new,	/* mech_new */
@@ -5306,7 +5308,7 @@
 	if (rv != CKR_OK) {
 #ifdef DEBUG
 	    utils->log(utils->conn, SASL_LOG_DEBUG,
-	    	       "C_GetMechanismList returned 0x%.8X count:%d\n", rv,
+		       "C_GetMechanismList returned 0x%.8X count:%d\n", rv,
 		       ulMechTypeCount);
 #endif
 	    utils->free(pMechTypeList);
--- a/usr/src/lib/sasl_plugins/login/login.c	Tue Mar 13 14:16:40 2018 +0200
+++ b/usr/src/lib/sasl_plugins/login/login.c	Tue Jul 11 15:35:32 2017 +0300
@@ -10,7 +10,7 @@
  * based on PLAIN, by Tim Martin <tmartin@andrew.cmu.edu>
  * $Id: login.c,v 1.25 2003/02/13 19:56:04 rjs3 Exp $
  */
-/* 
+/*
  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -28,7 +28,7 @@
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For permission or any other legal
- *    details, please contact  
+ *    details, please contact
  *      Office of Technology Transfer
  *      Carnegie Mellon University
  *      5000 Forbes Avenue
@@ -80,27 +80,27 @@
     size_t username_len;
 } server_context_t;
 
-static int login_server_mech_new(void *glob_context __attribute__((unused)), 
+static int login_server_mech_new(void *glob_context __attribute__((unused)),
 				 sasl_server_params_t *sparams,
 				 const char *challenge __attribute__((unused)),
 				 unsigned challen __attribute__((unused)),
 				 void **conn_context)
 {
     server_context_t *text;
-    
+
     /* holds state are in */
     text = sparams->utils->malloc(sizeof(server_context_t));
     if (text == NULL) {
 	MEMERROR( sparams->utils );
 	return SASL_NOMEM;
     }
-    
+
     memset(text, 0, sizeof(server_context_t));
-    
+
     text->state = 1;
-    
+
     *conn_context = text;
-    
+
     return SASL_OK;
 }
 
@@ -116,10 +116,10 @@
 				  sasl_out_params_t *oparams)
 {
     server_context_t *text = (server_context_t *) conn_context;
-    
+
     *serverout = NULL;
     *serveroutlen = 0;
-    
+
     switch (text->state) {
 
     case 1:
@@ -129,14 +129,14 @@
 	/* In this case fall through to state 2 */
 	if (clientinlen == 0) {
 	    /* demand username */
-	    
+
 	    *serveroutlen = strlen(USERNAME_CHALLENGE);
 	    *serverout = USERNAME_CHALLENGE;
 
 	    return SASL_CONTINUE;
 	}
-	
-	
+	/* FALLTHROUGH */
+
     case 2:
 	/* Catch really long usernames */
 	if (clientinlen > 1024) {
@@ -148,7 +148,7 @@
 #endif	/* _SUN_SDK_ */
 	    return SASL_BADPROT;
 	}
-	
+
 	/* get username */
 	text->username =
 	    params->utils->malloc(sizeof(sasl_secret_t) + clientinlen + 1);
@@ -156,24 +156,24 @@
 	    MEMERROR( params->utils );
 	    return SASL_NOMEM;
 	}
-	
+
 	strncpy(text->username, clientin, clientinlen);
 	text->username_len = clientinlen;
 	text->username[clientinlen] = '\0';
-	
+
 	/* demand password */
 	*serveroutlen = strlen(PASSWORD_CHALLENGE);
 	*serverout = PASSWORD_CHALLENGE;
-	
+
 	text->state = 3;
-	
+
 	return SASL_CONTINUE;
-	
-	
+
+
     case 3: {
 	sasl_secret_t *password;
 	int result;
-	
+
 	/* Catch really long passwords */
 	if (clientinlen > 1024) {
 #ifdef _SUN_SDK_
@@ -185,7 +185,7 @@
 #endif	/* _SUN_SDK_ */
 	    return SASL_BADPROT;
 	}
-	
+
 	/* get password */
 	password =
 	    params->utils->malloc(sizeof(sasl_secret_t) + clientinlen + 1);
@@ -193,7 +193,7 @@
 	    MEMERROR(params->utils);
 	    return SASL_NOMEM;
 	}
-	
+
 	strncpy((char *)password->data, clientin, clientinlen);
 	password->data[clientinlen] = '\0';
 	password->len = clientinlen;
@@ -207,27 +207,27 @@
 		_plug_free_secret(params->utils, &password);
 		return result;
 	}
-	
+
 	/* verify_password - return sasl_ok on success */
 	result = params->utils->checkpass(params->utils->conn,
 					oparams->authid, oparams->alen,
 					(char *)password->data, password->len);
-	
+
 	if (result != SASL_OK) {
 	    _plug_free_secret(params->utils, &password);
 	    return result;
 	}
-	
+
 	if (params->transition) {
 	    params->transition(params->utils->conn,
 			       (char *)password->data, password->len);
 	}
-	
+
 	_plug_free_secret(params->utils, &password);
-	
+
 	*serverout = NULL;
 	*serveroutlen = 0;
-	
+
 	oparams->doneflag = 1;
 	oparams->mech_ssf = 0;
 	oparams->maxoutbuf = 0;
@@ -236,7 +236,7 @@
 	oparams->decode_context = NULL;
 	oparams->decode = NULL;
 	oparams->param_version = 0;
-	
+
 	return SASL_OK;
     }
 
@@ -246,7 +246,7 @@
 			   "Invalid LOGIN server step %d\n", text->state);
 	return SASL_FAIL;
     }
-    
+
     return SASL_FAIL; /* should never get here */
 }
 
@@ -254,15 +254,15 @@
 				      const sasl_utils_t *utils)
 {
     server_context_t *text = (server_context_t *) conn_context;
-    
+
     if (!text) return;
-    
+
     if (text->username) utils->free(text->username);
-    
+
     utils->free(text);
 }
 
-static sasl_server_plug_t login_server_plugins[] = 
+static sasl_server_plug_t login_server_plugins[] =
 {
     {
 	"LOGIN",			/* mech_name */
@@ -292,11 +292,11 @@
 	SETERROR(utils, "LOGIN version mismatch");
 	return SASL_BADVERS;
     }
-    
+
     *out_version = SASL_SERVER_PLUG_VERSION;
     *pluglist = login_server_plugins;
-    *plugcount = 1;  
-    
+    *plugcount = 1;
+
     return SASL_OK;
 }
 
@@ -317,20 +317,20 @@
 				 void **conn_context)
 {
     client_context_t *text;
-    
+
     /* holds state are in */
     text = params->utils->malloc(sizeof(client_context_t));
     if (text == NULL) {
 	MEMERROR(params->utils);
 	return SASL_NOMEM;
     }
-    
+
     memset(text, 0, sizeof(client_context_t));
-    
+
     text->state = 1;
-    
+
     *conn_context = text;
-    
+
     return SASL_OK;
 }
 
@@ -344,10 +344,10 @@
 				  sasl_out_params_t *oparams)
 {
     client_context_t *text = (client_context_t *) conn_context;
-    
+
     *clientout = NULL;
     *clientoutlen = 0;
-    
+
     switch (text->state) {
 
     case 1: {
@@ -355,7 +355,7 @@
 	int auth_result = SASL_OK;
 	int pass_result = SASL_OK;
 	int result;
-	
+
 	/* check if sec layer strong enough */
 	if (params->props.min_ssf > params->external_ssf) {
 #ifdef _INTEGRATED_SOLARIS_
@@ -366,7 +366,7 @@
 #endif /* _INTEGRATED_SOLARIS_ */
 	    return SASL_TOOWEAK;
 	}
-	
+
 	/* try to get the userid */
 	/* Note: we want to grab the authname and not the userid, which is
 	 *       who we AUTHORIZE as, and will be the same as the authname
@@ -374,26 +374,26 @@
 	 */
 	if (oparams->user == NULL) {
 	    auth_result = _plug_get_authid(params->utils, &user, prompt_need);
-	    
+
 	    if ((auth_result != SASL_OK) && (auth_result != SASL_INTERACT))
 		return auth_result;
 	}
-	
+
 	/* try to get the password */
 	if (text->password == NULL) {
 	    pass_result = _plug_get_password(params->utils, &text->password,
 					     &text->free_password, prompt_need);
-	    
+
 	    if ((pass_result != SASL_OK) && (pass_result != SASL_INTERACT))
 		return pass_result;
 	}
-	
+
 	/* free prompts we got */
 	if (prompt_need && *prompt_need) {
 	    params->utils->free(*prompt_need);
 	    *prompt_need = NULL;
 	}
-	
+
 	/* if there are prompts not filled in */
 	if ((auth_result == SASL_INTERACT) || (pass_result == SASL_INTERACT)) {
 	    /* make the prompt list */
@@ -420,19 +420,19 @@
 				   NULL, NULL, NULL);
 #endif /* _INTEGRATED_SOLARIS_ */
 	    if (result != SASL_OK) return result;
-	    
+
 	    return SASL_INTERACT;
 	}
-	
+
 	if (!text->password) {
 	    PARAMERROR(params->utils);
 	    return SASL_BADPARAM;
 	}
-    
+
 	result = params->canon_user(params->utils->conn, user, 0,
 				    SASL_CU_AUTHID | SASL_CU_AUTHZID, oparams);
 	if (result != SASL_OK) return result;
-	
+
 	/* server should have sent request for username - we ignore it */
 	if (!serverin) {
 #ifdef _SUN_SDK_
@@ -444,17 +444,17 @@
 #endif /* _SUN_SDK_ */
 	    return SASL_BADPROT;
 	}
-	
+
 	if (!clientout) {
 	    PARAMERROR( params->utils );
 	    return SASL_BADPARAM;
 	}
-	
+
 	if (clientoutlen) *clientoutlen = oparams->alen;
 	*clientout = oparams->authid;
-	
+
 	text->state = 2;
-	
+
 	return SASL_CONTINUE;
     }
 
@@ -470,15 +470,15 @@
 #endif /* _SUN_SDK_ */
 	    return SASL_BADPROT;
 	}
-	
+
 	if (!clientout) {
 	    PARAMERROR(params->utils);
 	    return SASL_BADPARAM;
 	}
-	
+
 	if (clientoutlen) *clientoutlen = text->password->len;
 	*clientout = (char *)text->password->data;
-	
+
 	/* set oparams */
 	oparams->doneflag = 1;
 	oparams->mech_ssf = 0;
@@ -488,7 +488,7 @@
 	oparams->decode_context = NULL;
 	oparams->decode = NULL;
 	oparams->param_version = 0;
-	
+
 	return SASL_OK;
 
     default:
@@ -504,19 +504,19 @@
 				      const sasl_utils_t *utils)
 {
     client_context_t *text = (client_context_t *) conn_context;
-    
+
     if (!text) return;
-    
+
     /* free sensitive info */
     if (text->free_password) _plug_free_secret(utils, &(text->password));
 #ifdef _INTEGRATED_SOLARIS_
     convert_prompt(utils, &text->h, NULL);
 #endif /* _INTEGRATED_SOLARIS_ */
-    
+
     utils->free(text);
 }
 
-static sasl_client_plug_t login_client_plugins[] = 
+static sasl_client_plug_t login_client_plugins[] =
 {
     {
 	"LOGIN",			/* mech_name */
@@ -545,10 +545,10 @@
 	SETERROR(utils, "Version mismatch in LOGIN");
 	return SASL_BADVERS;
     }
-    
+
     *out_version = SASL_CLIENT_PLUG_VERSION;
     *pluglist = login_client_plugins;
     *plugcount = 1;
-    
+
     return SASL_OK;
 }