mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Use sys/endian.h instead of geom_enc.c for endian-agnostfication.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2003-04-03 11:33:51 +00:00
parent 4a36c1fdf3
commit 82db45a5af
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113010
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/geom/bde/g_bde_crypt.c
View File

@ -43,6 +43,7 @@
#include <sys/queue.h>
#include <sys/malloc.h>
#include <sys/libkern.h>
#include <sys/endian.h>
#include <sys/md5.h>
#include <crypto/rijndael/rijndael.h>
@ -80,7 +81,7 @@ g_bde_kkey(struct g_bde_softc *sc, keyInstance *ki, int dir, off_t sector)
u_char buf2[8];
/* We have to be architecture neutral */
g_enc_le8(buf2, sector);
le64enc(buf2, sector);
MD5Init(&ct);
MD5Update(&ct, sc->key.salt, 8);

33
sys/geom/bde/g_bde_lock.c
View File

@ -40,6 +40,7 @@
#include <sys/queue.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/endian.h>
#include <sys/md5.h>
#ifdef _KERNEL
@ -156,30 +157,30 @@ g_bde_encode_lock(struct g_bde_softc *sc, struct g_bde_key *gl, u_char *ptr)
for (i = 0; i < NLOCK_FIELDS; i++) {
switch(shuffle[i]) {
case 0:
g_enc_le8(p, gl->sector0);
le64enc(p, gl->sector0);
p += 8;
break;
case 1:
g_enc_le8(p, gl->sectorN);
le64enc(p, gl->sectorN);
p += 8;
break;
case 2:
g_enc_le8(p, gl->keyoffset);
le64enc(p, gl->keyoffset);
p += 8;
break;
case 3:
g_enc_le4(p, gl->sectorsize);
le32enc(p, gl->sectorsize);
p += 4;
break;
case 4:
g_enc_le4(p, gl->flags);
le32enc(p, gl->flags);
p += 4;
break;
case 5:
case 6:
case 7:
case 8:
g_enc_le8(p, gl->lsector[shuffle[i] - 5]);
le64enc(p, gl->lsector[shuffle[i] - 5]);
p += 8;
break;
case 9:
@ -226,30 +227,30 @@ g_bde_decode_lock(struct g_bde_softc *sc, struct g_bde_key *gl, u_char *ptr)
for (i = 0; i < NLOCK_FIELDS; i++) {
switch(shuffle[i]) {
case 0:
gl->sector0 = g_dec_le8(p);
gl->sector0 = le64dec(p);
p += 8;
break;
case 1:
gl->sectorN = g_dec_le8(p);
gl->sectorN = le64dec(p);
p += 8;
break;
case 2:
gl->keyoffset = g_dec_le8(p);
gl->keyoffset = le64dec(p);
p += 8;
break;
case 3:
gl->sectorsize = g_dec_le4(p);
gl->sectorsize = le32dec(p);
p += 4;
break;
case 4:
gl->flags = g_dec_le4(p);
gl->flags = le32dec(p);
p += 4;
break;
case 5:
case 6:
case 7:
case 8:
gl->lsector[shuffle[i] - 5] = g_dec_le8(p);
gl->lsector[shuffle[i] - 5] = le64dec(p);
p += 8;
break;
case 9:
@ -308,8 +309,8 @@ g_bde_keyloc_encrypt(struct g_bde_softc *sc, uint64_t *input, void *output)
keyInstance ki;
cipherInstance ci;
g_enc_le8(buf, input[0]);
g_enc_le8(buf + 8, input[1]);
le64enc(buf, input[0]);
le64enc(buf + 8, input[1]);
AES_init(&ci);
AES_makekey(&ki, DIR_ENCRYPT, G_BDE_KKEYBITS, sc->sha2 + 0);
AES_encrypt(&ci, &ki, buf, output, sizeof buf);
@ -329,8 +330,8 @@ g_bde_keyloc_decrypt(struct g_bde_softc *sc, void *input, uint64_t *output)
AES_init(&ci);
AES_makekey(&ki, DIR_DECRYPT, G_BDE_KKEYBITS, sc->sha2 + 0);
AES_decrypt(&ci, &ki, input, buf, sizeof buf);
output[0] = g_dec_le8(buf);
output[1] = g_dec_le8(buf + 8);
output[0] = le64dec(buf);
output[1] = le64dec(buf + 8);
bzero(buf, sizeof buf);
bzero(&ci, sizeof ci);
bzero(&ki, sizeof ki);