Attachment 156004 Details for Bug 199705 – patch for geli

[patch] patch for geli

geli.patch (text/plain), 2.06 KB, created by luke.tw on 2015-04-26 11:07:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: luke.tw

Created: 2015-04-26 11:07:14 UTC

Size: 2.06 KB

patch

obsolete

>Index: sys/geom/eli/g_eli_integrity.c
>===================================================================
>--- sys/geom/eli/g_eli_integrity.c	(revision 281992)
>+++ sys/geom/eli/g_eli_integrity.c	(working copy)
>@@ -408,7 +408,6 @@ g_eli_auth_run(struct g_eli_worker *wr, struct bio
> 	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__);
>@@ -451,7 +450,6 @@ g_eli_auth_run(struct g_eli_worker *wr, struct bio
> 	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);
>@@ -519,10 +517,6 @@ g_eli_auth_run(struct g_eli_worker *wr, struct bio
> 		crda->crd_klen = G_ELI_AUTH_SECKEYLEN * 8;
> 
> 		crp->crp_etype = 0;
>-		err = crypto_dispatch(crp);
>-		if (err != 0 && error == 0)
>-			error = err;
>+		crypto_dispatch(crp);
> 	}
>-	if (bp->bio_error == 0)
>-		bp->bio_error = error;
> }
>Index: sys/geom/eli/g_eli_privacy.c
>===================================================================
>--- sys/geom/eli/g_eli_privacy.c	(revision 281992)
>+++ sys/geom/eli/g_eli_privacy.c	(working copy)
>@@ -230,7 +230,6 @@ g_eli_crypto_run(struct g_eli_worker *wr, struct b
> 	struct cryptop *crp;
> 	struct cryptodesc *crd;
> 	u_int i, nsec, secsize;
>-	int err, error;
> 	off_t dstoff;
> 	size_t size;
> 	u_char *p, *data;
>@@ -271,7 +270,6 @@ g_eli_crypto_run(struct g_eli_worker *wr, struct b
> 		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);
>@@ -308,10 +306,6 @@ g_eli_crypto_run(struct g_eli_worker *wr, struct b
> 		crd->crd_next = NULL;
> 
> 		crp->crp_etype = 0;
>-		err = crypto_dispatch(crp);
>-		if (error == 0)
>-			error = err;
>+		crypto_dispatch(crp);
> 	}
>-	if (bp->bio_error == 0)
>-		bp->bio_error = error;
> }

Actions: View | Diff

Attachments on bug 199705: 156004