Attachment #156004 for bug #199705

View | Details | Raw Unified | Return to bug 199705
Collapse All | Expand All




	struct cryptodesc *crde, *crda;
	u_int i, lsec, nsec, data_secsize, decr_secsize, encr_secsize;
	off_t dstoff;
	int err, error;
	u_char *p, *data, *auth, *authkey, *plaindata;

	G_ELI_LOGREQ(3, bp, "%s", __func__);

	bp->bio_inbed = 0;
	bp->bio_children = nsec;

	error = 0;
	for (i = 1; i <= nsec; i++, dstoff += encr_secsize) {
		crp = (struct cryptop *)p;	p += sizeof(*crp);
		crde = (struct cryptodesc *)p;	p += sizeof(*crde);

		crda->crd_klen = G_ELI_AUTH_SECKEYLEN * 8;

		crp->crp_etype = 0;
		crypto_dispatch(crp);
		if (err != 0 && error == 0)
			error = err;
	}
	if (bp->bio_error == 0)
		bp->bio_error = error;
}




	struct cryptop *crp;
	struct cryptodesc *crd;
	u_int i, nsec, secsize;
	int err, error;
	off_t dstoff;
	size_t size;
	u_char *p, *data;

		bcopy(bp->bio_data, data, bp->bio_length);
	}

	error = 0;
	for (i = 0, dstoff = bp->bio_offset; i < nsec; i++, dstoff += secsize) {
		crp = (struct cryptop *)p;	p += sizeof(*crp);
		crd = (struct cryptodesc *)p;	p += sizeof(*crd);

		crd->crd_next = NULL;

		crp->crp_etype = 0;
		crypto_dispatch(crp);
		if (error == 0)
			error = err;
	}
	if (bp->bio_error == 0)
		bp->bio_error = error;
}

Return to bug 199705

Lines 408-414 g_eli_auth_run(struct g_eli_worker *wr, struct bio Link Here

(-)sys/geom/eli/g_eli_integrity.c (-7 / +1 lines)
408	struct cryptodesc crde, crda;	408	struct cryptodesc crde, crda;
409	u_int i, lsec, nsec, data_secsize, decr_secsize, encr_secsize;	409	u_int i, lsec, nsec, data_secsize, decr_secsize, encr_secsize;
410	off_t dstoff;	410	off_t dstoff;
411	int err, error;
412	u_char p, data, auth, authkey, *plaindata;	411	u_char p, data, auth, authkey, *plaindata;
413		412
414	G_ELI_LOGREQ(3, bp, "%s", __func__);	413	G_ELI_LOGREQ(3, bp, "%s", __func__);
Lines 451-457 g_eli_auth_run(struct g_eli_worker *wr, struct bio Link Here
451	bp->bio_inbed = 0;	450	bp->bio_inbed = 0;
452	bp->bio_children = nsec;	451	bp->bio_children = nsec;
453		452
454	error = 0;
455	for (i = 1; i <= nsec; i++, dstoff += encr_secsize) {	453	for (i = 1; i <= nsec; i++, dstoff += encr_secsize) {
456	crp = (struct cryptop )p; p += sizeof(crp);	454	crp = (struct cryptop )p; p += sizeof(crp);
457	crde = (struct cryptodesc )p; p += sizeof(crde);	455	crde = (struct cryptodesc )p; p += sizeof(crde);
Lines 519-528 g_eli_auth_run(struct g_eli_worker *wr, struct bio Link Here
519	crda->crd_klen = G_ELI_AUTH_SECKEYLEN * 8;	517	crda->crd_klen = G_ELI_AUTH_SECKEYLEN * 8;
520		518
521	crp->crp_etype = 0;	519	crp->crp_etype = 0;
522	err = crypto_dispatch(crp);	520	crypto_dispatch(crp);
523	if (err != 0 && error == 0)
524	error = err;
525	}	521	}
526	if (bp->bio_error == 0)
527	bp->bio_error = error;
528	}	522	}

Lines 230-236 g_eli_crypto_run(struct g_eli_worker *wr, struct b Link Here

(-)sys/geom/eli/g_eli_privacy.c (-7 / +1 lines)
230	struct cryptop *crp;	230	struct cryptop *crp;
231	struct cryptodesc *crd;	231	struct cryptodesc *crd;
232	u_int i, nsec, secsize;	232	u_int i, nsec, secsize;
233	int err, error;
234	off_t dstoff;	233	off_t dstoff;
235	size_t size;	234	size_t size;
236	u_char p, data;	235	u_char p, data;
Lines 271-277 g_eli_crypto_run(struct g_eli_worker *wr, struct b Link Here
271	bcopy(bp->bio_data, data, bp->bio_length);	270	bcopy(bp->bio_data, data, bp->bio_length);
272	}	271	}
273		272
274	error = 0;
275	for (i = 0, dstoff = bp->bio_offset; i < nsec; i++, dstoff += secsize) {	273	for (i = 0, dstoff = bp->bio_offset; i < nsec; i++, dstoff += secsize) {
276	crp = (struct cryptop )p; p += sizeof(crp);	274	crp = (struct cryptop )p; p += sizeof(crp);
277	crd = (struct cryptodesc )p; p += sizeof(crd);	275	crd = (struct cryptodesc )p; p += sizeof(crd);
Lines 308-317 g_eli_crypto_run(struct g_eli_worker *wr, struct b Link Here
308	crd->crd_next = NULL;	306	crd->crd_next = NULL;
309		307
310	crp->crp_etype = 0;	308	crp->crp_etype = 0;
311	err = crypto_dispatch(crp);	309	crypto_dispatch(crp);
312	if (error == 0)
313	error = err;
314	}	310	}
315	if (bp->bio_error == 0)
316	bp->bio_error = error;
317	}	311	}