Commits
- Commit:
c285a1f8b9de1be75e044892c4c7af139e5156bc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add another test case where a context line appears as both - and +
This line appears as a context line with regular diff(1) and git diff:
crd->crd_key = sd->mds.mdd_crypto.scr_key[0];
[[[
+ crd->crd_alg = sd->mds.mdd_crypto.scr_alg;
+ crd->crd_klen = sd->mds.mdd_crypto.scr_klen;
crd->crd_key = sd->mds.mdd_crypto.scr_key[0];
- bcopy(&blk, crd->crd_iv, sizeof(blk));
+ memcpy(crd->crd_iv, &blkno, sizeof(blkno));
]]]
Our diff produces a different result where this context line is
both deleted and added:
[[[
- crd->crd_alg = CRYPTO_AES_XTS;
+ crd->crd_alg = sd->mds.mdd_crypto.scr_alg;
+ crd->crd_klen = sd->mds.mdd_crypto.scr_klen;
+ crd->crd_key = sd->mds.mdd_crypto.scr_key[0];
+ memcpy(crd->crd_iv, &blkno, sizeof(blkno));
+ }
- switch (sd->mds.mdd_crypto.scr_meta->scm_alg) {
- case SR_CRYPTOA_AES_XTS_128:
- crd->crd_klen = 256;
- break;
- case SR_CRYPTOA_AES_XTS_256:
- crd->crd_klen = 512;
- break;
- default:
- goto unwind;
- }
- crd->crd_key = sd->mds.mdd_crypto.scr_key[0];
- bcopy(&blk, crd->crd_iv, sizeof(blk));
- }
- crwu->cr_wu = wu;
- crwu->cr_crp->crp_opaque = crwu;
-
return (crwu);
]]]