Attachment #601022 for bug #700228




	case AUTH_CHAP_ALG_SHA256:
		digest = EVP_sha256();
		break;
#ifndef LIBRESSL_VERSION_NUMBER
	case AUTH_CHAP_ALG_SHA3_256:
		digest = EVP_sha3_256();
		break;
#endif
	}

	if (*context == NULL)

acl_chk_chap_alg_optn(int chap_algorithm)
{
	if (chap_algorithm == AUTH_OPTION_NONE ||
#ifndef LIBRESSL_VERSION_NUMBER
	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
#endif
	    chap_algorithm == AUTH_CHAP_ALG_SHA256 ||
	    chap_algorithm == AUTH_CHAP_ALG_SHA1 ||
	    chap_algorithm == AUTH_CHAP_ALG_MD5)

				case AUTH_CHAP_ALG_SHA256:
					client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
					break;
#ifndef LIBRESSL_VERSION_NUMBER
				case AUTH_CHAP_ALG_SHA3_256:
					client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;
					break;
#endif
				}
				return;
			}

			client->local_state = AUTH_LOCAL_STATE_ERROR;
			client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
			break;
		} else if (
#ifndef LIBRESSL_VERSION_NUMBER
			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
#endif
			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&
			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&
			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {

	EVP_MD_CTX *context = EVP_MD_CTX_new();
	int i = 0;

#ifndef LIBRESSL_VERSION_NUMBER
	if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
		value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
	}
#endif
	if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {
		value_list[i++] = AUTH_CHAP_ALG_SHA256;
	}

Lines 67-74 Link Here

(-)open-iscsi-2.1.0.old/usr/auth.h (+4 lines)
67	AUTH_CHAP_ALG_MD5 = 5,	67	AUTH_CHAP_ALG_MD5 = 5,
68	AUTH_CHAP_ALG_SHA1 = 6,	68	AUTH_CHAP_ALG_SHA1 = 6,
69	AUTH_CHAP_ALG_SHA256 = 7,	69	AUTH_CHAP_ALG_SHA256 = 7,
		70	#ifdef LIBRESSL_VERSION_NUMBER
		71	AUTH_CHAP_ALG_MAX_COUNT = 4
		72	#else
70	AUTH_CHAP_ALG_SHA3_256 = 8,	73	AUTH_CHAP_ALG_SHA3_256 = 8,
71	AUTH_CHAP_ALG_MAX_COUNT = 5	74	AUTH_CHAP_ALG_MAX_COUNT = 5
		75	#endif
72	};	76	};
73		77
74	enum auth_neg_role {	78	enum auth_neg_role {

Return to bug 700228

Lines 182-190 Link Here

(-)open-iscsi-2.1.0.old/usr/auth.c (-1 / +12 lines)
182	case AUTH_CHAP_ALG_SHA256:	182	case AUTH_CHAP_ALG_SHA256:
183	digest = EVP_sha256();	183	digest = EVP_sha256();
184	break;	184	break;
		185	#ifndef LIBRESSL_VERSION_NUMBER
185	case AUTH_CHAP_ALG_SHA3_256:	186	case AUTH_CHAP_ALG_SHA3_256:
186	digest = EVP_sha3_256();	187	digest = EVP_sha3_256();
187	break;	188	break;
		189	#endif
188	}	190	}
189		191
190	if (*context == NULL)	192	if (*context == NULL)
Lines 335-341 Link Here
335	acl_chk_chap_alg_optn(int chap_algorithm)	337	acl_chk_chap_alg_optn(int chap_algorithm)
336	{	338	{
337	if (chap_algorithm == AUTH_OPTION_NONE \|\|	339	if (chap_algorithm == AUTH_OPTION_NONE \|\|
		340	#ifndef LIBRESSL_VERSION_NUMBER
338	chap_algorithm == AUTH_CHAP_ALG_SHA3_256 \|\|	341	chap_algorithm == AUTH_CHAP_ALG_SHA3_256 \|\|
		342	#endif
339	chap_algorithm == AUTH_CHAP_ALG_SHA256 \|\|	343	chap_algorithm == AUTH_CHAP_ALG_SHA256 \|\|
340	chap_algorithm == AUTH_CHAP_ALG_SHA1 \|\|	344	chap_algorithm == AUTH_CHAP_ALG_SHA1 \|\|
341	chap_algorithm == AUTH_CHAP_ALG_MD5)	345	chap_algorithm == AUTH_CHAP_ALG_MD5)
Lines 748-756 Link Here
748	case AUTH_CHAP_ALG_SHA256:	752	case AUTH_CHAP_ALG_SHA256:
749	client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;	753	client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
750	break;	754	break;
		755	#ifndef LIBRESSL_VERSION_NUMBER
751	case AUTH_CHAP_ALG_SHA3_256:	756	case AUTH_CHAP_ALG_SHA3_256:
752	client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;	757	client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;
753	break;	758	break;
		759	#endif
754	}	760	}
755	return;	761	return;
756	}	762	}
Lines 899-905 Link Here
899	client->local_state = AUTH_LOCAL_STATE_ERROR;	905	client->local_state = AUTH_LOCAL_STATE_ERROR;
900	client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;	906	client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
901	break;	907	break;
902	} else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&	908	} else if (
		909	#ifndef LIBRESSL_VERSION_NUMBER
		910	(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
		911	#endif
903	(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&	912	(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&
904	(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&	913	(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&
905	(client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {	914	(client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {
Lines 1823-1831 Link Here
1823	EVP_MD_CTX *context = EVP_MD_CTX_new();	1832	EVP_MD_CTX *context = EVP_MD_CTX_new();
1824	int i = 0;	1833	int i = 0;
1825		1834
		1835	#ifndef LIBRESSL_VERSION_NUMBER
1826	if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {	1836	if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
1827	value_list[i++] = AUTH_CHAP_ALG_SHA3_256;	1837	value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
1828	}	1838	}
		1839	#endif
1829	if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {	1840	if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {
1830	value_list[i++] = AUTH_CHAP_ALG_SHA256;	1841	value_list[i++] = AUTH_CHAP_ALG_SHA256;
1831	}	1842	}