Skip to content

Commit

Permalink
mixed a merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuriy Polyakov committed Jul 28, 2023
1 parent b479986 commit 802b226
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/pke/lib/constants-impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,12 @@ std::ostream& operator<<(std::ostream& s, ProxyReEncryptionMode p) {
s << "INDCPA";
break;
case FIXED_NOISE_HRA:
SecretKeyDist convertToSecretKeyDist(uint32_t num);

s << "FIXED_NOISE_HRA";
break;
case NOISE_FLOODING_HRA:
s << "NOISE_FLOODING_HRA";
break;
case DIVIDE_AND_ROUND_HRA:
s << "DIVIDE_AND_ROUND_HRA";
break;
default:
Expand Down

0 comments on commit 802b226

Please # to comment.