Revert "union"

This reverts commit 20714489cf.
This commit is contained in:
Markus Teich 2016-09-29 10:22:00 +02:00
parent e52b751b87
commit 656aa46553

View File

@ -147,25 +147,18 @@ struct BRANDT_Auction {
gcry_mpi_point_t **alpha; /** alphas, size: n*k */ gcry_mpi_point_t **alpha; /** alphas, size: n*k */
gcry_mpi_point_t **beta; /** betas, size: n*k */ gcry_mpi_point_t **beta; /** betas, size: n*k */
union { gcry_mpi_point_t **gamma2; /** gamma2, for public outcome, size: n*k */
gcry_mpi_point_t ***gamma3; /** gamma3, for private outcome, size: n*n*k */
gcry_mpi_point_t **delta2; /** delta2, for public outcome, size: n*k */
gcry_mpi_point_t ***delta3; /** delta3, for private outcome, size: n*n*k */
gcry_mpi_point_t **phi2; /** phi2, for public outcome, size: n*k */
gcry_mpi_point_t ***phi3; /** phi3, for private outcome, size: n*n*k */
struct { /** proofs for the correctnes of the phi values, size: n*k */
gcry_mpi_point_t **gamma2; /** gamma2, for public outcome, size: n*k */ struct proof_2dle ***phiproofs2;
gcry_mpi_point_t **delta2; /** delta2, for public outcome, size: n*k */
gcry_mpi_point_t **phi2; /** phi2, for public outcome, size: n*k */
/** proofs for the correctnes of the phi values, size: n*k */
struct proof_2dle ***phiproofs2;
};
struct { /** proofs for the correctnes of the phi values, size: n*n*k */
gcry_mpi_point_t ***gamma3; /** gamma3, for private outcome, size: n*n*k */ struct proof_2dle ***phiproofs3;
gcry_mpi_point_t ***delta3; /** delta3, for private outcome, size: n*n*k */
gcry_mpi_point_t ***phi3; /** phi3, for private outcome, size: n*n*k */
/** proofs for the correctnes of the phi values, size: n*n*k */
struct proof_2dle ***phiproofs3;
};
};
gcry_mpi_point_t *tmpa1; /** used for temporary storage, size: k */ gcry_mpi_point_t *tmpa1; /** used for temporary storage, size: k */
gcry_mpi_point_t *tmpb1; /** used for temporary storage, size: k */ gcry_mpi_point_t *tmpb1; /** used for temporary storage, size: k */