svn commit: r213063 - head/sys/geom/eli

[Pawel Jakub Dawidek]

Author: pjd
Date: Thu Sep 23 11:23:10 2010
New Revision: 213063
URL: http://svn.freebsd.org/changeset/base/213063

Log:
  Make the code similar to the code in g_eli_integrity.c.
  
  MFC after:    1 week

Modified:
  head/sys/geom/eli/g_eli_privacy.c

Modified: head/sys/geom/eli/g_eli_privacy.c
==============================================================================
--- head/sys/geom/eli/g_eli_privacy.c   Thu Sep 23 11:19:48 2010        
(r213062)
+++ head/sys/geom/eli/g_eli_privacy.c   Thu Sep 23 11:23:10 2010        
(r213063)
@@ -175,8 +175,9 @@ g_eli_crypto_run(struct g_eli_worker *wr
        struct cryptodesc *crd;
        struct uio *uio;
        struct iovec *iov;
-       u_int i, nsec, add, secsize;
+       u_int i, nsec, secsize;
        int err, error;
+       off_t dstoff;
        size_t size;
        u_char *p, *data;
 
@@ -219,7 +220,7 @@ g_eli_crypto_run(struct g_eli_worker *wr
        }
 
        error = 0;
-       for (i = 0, add = 0; i < nsec; i++, add += secsize) {
+       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);
                uio = (struct uio *)p;          p += sizeof(*uio);
@@ -256,7 +257,7 @@ g_eli_crypto_run(struct g_eli_worker *wr
                crd->crd_alg = sc->sc_ealgo;
                crd->crd_key = sc->sc_ekey;
                crd->crd_klen = sc->sc_ekeylen;
-               g_eli_crypto_ivgen(sc, bp->bio_offset + add, crd->crd_iv,
+               g_eli_crypto_ivgen(sc, dstoff, crd->crd_iv,
                    sizeof(crd->crd_iv));
                crd->crd_next = NULL;
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"