View | Details | Raw Unified | Return to bug 216790 | Differences between
and this patch

Collapse All | Expand All

(-)src/tls/tls_dh.c (+5 lines)
Lines 271-276 Link Here
271
    while ((curve = mystrtok(&curves, CHARS_COMMA_SP)) != 0) {
271
    while ((curve = mystrtok(&curves, CHARS_COMMA_SP)) != 0) {
272
	int     nid = EC_curve_nist2nid(curve);
272
	int     nid = EC_curve_nist2nid(curve);
273
273
274
	msg_warn("DEBUG 1 : trying ECDHE curve \"%s\"", curve);
275
274
	if (nid == NID_undef)
276
	if (nid == NID_undef)
275
	    nid = OBJ_sn2nid(curve);
277
	    nid = OBJ_sn2nid(curve);
276
	if (nid == NID_undef)
278
	if (nid == NID_undef)
Lines 281-286 Link Here
281
	    continue;
283
	    continue;
282
	}
284
	}
283
285
286
	msg_warn("DEBUG 2 : trying ECDHE curve \"%s\"", curve);
287
284
	/*
288
	/*
285
	 * Validate the NID by trying it as the sole EC curve for a
289
	 * Validate the NID by trying it as the sole EC curve for a
286
	 * throw-away SSL context.  Silently skip unsupported code points.
290
	 * throw-away SSL context.  Silently skip unsupported code points.
Lines 289-294 Link Here
289
	 * be silently skipped when not yet supported.
293
	 * be silently skipped when not yet supported.
290
	 */
294
	 */
291
	if (SSL_CTX_set1_curves(tmpctx, &nid, 1) <= 0) {
295
	if (SSL_CTX_set1_curves(tmpctx, &nid, 1) <= 0) {
296
		msg_warn("DEBUG 3 : ignoring unknown ECDHE curve \"%s\"", curve);
292
	    ++unknown;
297
	    ++unknown;
293
	    continue;
298
	    continue;
294
	}
299
	}

Return to bug 216790