Merge pull request #33 from MartKro/master

Daniel D · web-flow · commit 7e43c5d796f6 · 2019-08-21T12:52:12.000+02:00
Fix AES fixed key ALSZ
diff --git a/ot/alsz-ot-ext-rec.cpp b/ot/alsz-ot-ext-rec.cpp
@@ -487,7 +487,7 @@ void ALSZOTExtRec::ComputeBaseOTs(field_type ftype) {
 			}*/
 			memcpy(buf, X[0]->GetArr() + secparambytes * m_nBaseOTs * i, secparambytes * m_nBaseOTs);
 			memcpy(buf + secparambytes * m_nBaseOTs, X[1]->GetArr() + secparambytes * m_nBaseOTs * i, secparambytes * m_nBaseOTs);
-			InitAESKey(tmp_keys, buf, nsndvals * m_nBaseOTs, m_cCrypt);
+			InitPRFKeys(tmp_keys, buf, nsndvals * m_nBaseOTs);
 			m_tBaseOTKeys.push_back(tmp_keys);
 		}
 
diff --git a/ot/alsz-ot-ext-snd.cpp b/ot/alsz-ot-ext-snd.cpp
@@ -507,7 +507,7 @@ void ALSZOTExtSnd::ComputeBaseOTs(field_type ftype) {
 			//tmp->choices->SetBits(U.GetArr(), (uint64_t) i * m_nBaseOTs, (uint64_t) m_nBaseOTs);
 			tmp_keys = (OT_AES_KEY_CTX*) malloc(sizeof(OT_AES_KEY_CTX) * m_nBaseOTs);
 
-			InitAESKey(tmp_keys, resp.GetArr()+i*m_nBaseOTs*secparambytes, m_nBaseOTs, m_cCrypt);
+			InitPRFKeys(tmp_keys, resp.GetArr() + i * m_nBaseOTs * secparambytes, m_nBaseOTs);
 			m_tBaseOTKeys.push_back(tmp_keys);
 
 		}

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ void ALSZOTExtRec::ComputeBaseOTs(field_type ftype) {`
`487`	`487`	`}*/`
`488`	`488`	`memcpy(buf, X[0]->GetArr() + secparambytes * m_nBaseOTs * i, secparambytes * m_nBaseOTs);`
`489`	`489`	`memcpy(buf + secparambytes * m_nBaseOTs, X[1]->GetArr() + secparambytes * m_nBaseOTs * i, secparambytes * m_nBaseOTs);`
`490`		`- InitAESKey(tmp_keys, buf, nsndvals * m_nBaseOTs, m_cCrypt);`
	`490`	`+ InitPRFKeys(tmp_keys, buf, nsndvals * m_nBaseOTs);`
`491`	`491`	`m_tBaseOTKeys.push_back(tmp_keys);`
`492`	`492`	`}`
`493`	`493`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ void ALSZOTExtSnd::ComputeBaseOTs(field_type ftype) {`
`507`	`507`	`//tmp->choices->SetBits(U.GetArr(), (uint64_t) i * m_nBaseOTs, (uint64_t) m_nBaseOTs);`
`508`	`508`	`tmp_keys = (OT_AES_KEY_CTX) malloc(sizeof(OT_AES_KEY_CTX) m_nBaseOTs);`
`509`	`509`
`510`		`- InitAESKey(tmp_keys, resp.GetArr()+im_nBaseOTssecparambytes, m_nBaseOTs, m_cCrypt);`
	`510`	`+ InitPRFKeys(tmp_keys, resp.GetArr() + i * m_nBaseOTs * secparambytes, m_nBaseOTs);`
`511`	`511`	`m_tBaseOTKeys.push_back(tmp_keys);`
`512`	`512`
`513`	`513`	`}`