xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devtls: allocate cipher states in secret memory

Browse source
This commit is contained in:
cinap_lenrek 2016-08-27 20:37:31 +02:00
parent 7250c438bb
commit 2967f942ea
1 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sys/src/9/port/devtls.c
View file

@ -1471,7 +1471,7 @@ struct Encalg
static void static void
initRC4key(Encalg *ea, Secret *s, uchar *p, uchar *) initRC4key(Encalg *ea, Secret *s, uchar *p, uchar *)
{ {
s->enckey = smalloc(sizeof(RC4state)); s->enckey = secalloc(sizeof(RC4state));
s->enc = rc4enc; s->enc = rc4enc;
s->dec = rc4enc; s->dec = rc4enc;
setupRC4state(s->enckey, p, ea->keylen); setupRC4state(s->enckey, p, ea->keylen);
@ -1480,7 +1480,7 @@ initRC4key(Encalg *ea, Secret *s, uchar *p, uchar *)
static void static void
initDES3key(Encalg *, Secret *s, uchar *p, uchar *iv) initDES3key(Encalg *, Secret *s, uchar *p, uchar *iv)
{ {
s->enckey = smalloc(sizeof(DES3state)); s->enckey = secalloc(sizeof(DES3state));
s->enc = des3enc; s->enc = des3enc;
s->dec = des3dec; s->dec = des3dec;
s->block = 8; s->block = 8;
@ -1490,7 +1490,7 @@ initDES3key(Encalg *, Secret *s, uchar *p, uchar *iv)
static void static void
initAESkey(Encalg *ea, Secret *s, uchar *p, uchar *iv) initAESkey(Encalg *ea, Secret *s, uchar *p, uchar *iv)
{ {
s->enckey = smalloc(sizeof(AESstate)); s->enckey = secalloc(sizeof(AESstate));
s->enc = aesenc; s->enc = aesenc;
s->dec = aesdec; s->dec = aesdec;
s->block = 16; s->block = 16;
@ -1500,7 +1500,7 @@ initAESkey(Encalg *ea, Secret *s, uchar *p, uchar *iv)
static void static void
initccpolykey(Encalg *ea, Secret *s, uchar *p, uchar *iv) initccpolykey(Encalg *ea, Secret *s, uchar *p, uchar *iv)
{ {
s->enckey = smalloc(sizeof(Chachastate)); s->enckey = secalloc(sizeof(Chachastate));
s->aead_enc = ccpoly_aead_enc; s->aead_enc = ccpoly_aead_enc;
s->aead_dec = ccpoly_aead_dec; s->aead_dec = ccpoly_aead_dec;
s->maclen = Poly1305dlen; s->maclen = Poly1305dlen;
@ -1517,7 +1517,7 @@ initccpolykey(Encalg *ea, Secret *s, uchar *p, uchar *iv)
static void static void
initaesgcmkey(Encalg *ea, Secret *s, uchar *p, uchar *iv) initaesgcmkey(Encalg *ea, Secret *s, uchar *p, uchar *iv)
{ {
s->enckey = smalloc(sizeof(AESGCMstate)); s->enckey = secalloc(sizeof(AESGCMstate));
s->aead_enc = aesgcm_aead_enc; s->aead_enc = aesgcm_aead_enc;
s->aead_dec = aesgcm_aead_dec; s->aead_dec = aesgcm_aead_dec;
s->maclen = 16; s->maclen = 16;
@ -1673,18 +1673,19 @@ tlswrite(Chan *c, void *a, long n, vlong off)
ea = parseencalg(cb->f[2]); ea = parseencalg(cb->f[2]);
p = cb->f[4]; p = cb->f[4];
m = (strlen(p)*3)/2; m = (strlen(p)*3)/2 + 1;
x = smalloc(m); x = secalloc(m);
tos = smalloc(sizeof(Secret)); tos = secalloc(sizeof(Secret));
toc = smalloc(sizeof(Secret)); toc = secalloc(sizeof(Secret));
if(waserror()){ if(waserror()){
secfree(x);
freeSec(tos); freeSec(tos);
freeSec(toc); freeSec(toc);
free(x);
nexterror(); nexterror();
} }
m = dec64(x, m, p, strlen(p)); m = dec64(x, m, p, strlen(p));
memset(p, 0, strlen(p));
if(m < 2 * ha->maclen + 2 * ea->keylen + 2 * ea->ivlen) if(m < 2 * ha->maclen + 2 * ea->keylen + 2 * ea->ivlen)
error("not enough secret data provided"); error("not enough secret data provided");
@ -1719,7 +1720,7 @@ tlswrite(Chan *c, void *a, long n, vlong off)
tos->encalg = ea->name; tos->encalg = ea->name;
tos->hashalg = ha->name; tos->hashalg = ha->name;
free(x); secfree(x);
poperror(); poperror();
}else if(strcmp(cb->f[0], "changecipher") == 0){ }else if(strcmp(cb->f[0], "changecipher") == 0){
if(cb->nf != 1) if(cb->nf != 1)
@ -2048,17 +2049,10 @@ tlsstate(int s)
static void static void
freeSec(Secret *s) freeSec(Secret *s)
{ {
void *k;
if(s == nil) if(s == nil)
return; return;
k = s->enckey; secfree(s->enckey);
if(k != nil){ secfree(s);
memset(k, 0, msize(k));
free(k);
}
memset(s, 0, sizeof(*s));
free(s);
} }
static int static int
@ -2162,6 +2156,8 @@ ccpoly_aead_setiv(Secret *sec, uchar seq[8])
iv[i+(ChachaIVlen-8)] ^= seq[i]; iv[i+(ChachaIVlen-8)] ^= seq[i];
chacha_setiv(cs, iv); chacha_setiv(cs, iv);
memset(iv, 0, sizeof(iv));
} }
static int static int
@ -2196,6 +2192,7 @@ aesgcm_aead_enc(Secret *sec, uchar *aad, int aadlen, uchar *reciv, uchar *data,
for(i=0; i<8; i++) iv[4+i] ^= aad[i]; for(i=0; i<8; i++) iv[4+i] ^= aad[i];
memmove(reciv, iv+4, 8); memmove(reciv, iv+4, 8);
aesgcm_setiv(sec->enckey, iv, 12); aesgcm_setiv(sec->enckey, iv, 12);
memset(iv, 0, sizeof(iv));
aesgcm_encrypt(data, len, aad, aadlen, data+len, sec->enckey); aesgcm_encrypt(data, len, aad, aadlen, data+len, sec->enckey);
return len + sec->maclen; return len + sec->maclen;
} }
@ -2211,6 +2208,7 @@ aesgcm_aead_dec(Secret *sec, uchar *aad, int aadlen, uchar *reciv, uchar *data,
memmove(iv, sec->mackey, 4); memmove(iv, sec->mackey, 4);
memmove(iv+4, reciv, 8); memmove(iv+4, reciv, 8);
aesgcm_setiv(sec->enckey, iv, 12); aesgcm_setiv(sec->enckey, iv, 12);
memset(iv, 0, sizeof(iv));
if(aesgcm_decrypt(data, len, aad, aadlen, data+len, sec->enckey) != 0) if(aesgcm_decrypt(data, len, aad, aadlen, data+len, sec->enckey) != 0)
return -1; return -1;
return len; return len;