Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Create one map for all automorphism keys (#566)" #609

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Revert "Create one map for all automorphism keys (#566)" #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
345 changes: 181 additions & 164 deletions src/pke/include/cryptocontext.h
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions src/pke/include/schemebase/base-advancedshe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,30 +210,33 @@ class AdvancedSHEBase {
* @param privateKey private key.
* @return returns the evaluation keys
*/
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumKeyGen(
const PrivateKey<Element> privateKey) const;
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumKeyGen(const PrivateKey<Element> privateKey,
const PublicKey<Element> publicKey) const;

/**
* Virtual function to generate the automorphism keys for EvalSumRows; works
* only for packed encoding
*
* @param privateKey private key.
* @param publicKey public key.
* @param rowSize size of rows in the matrix
* @param subringDim subring dimension (set to cyclotomic order if set to 0)
* @return returns the evaluation keys
*/
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumRowsKeyGen(const PrivateKey<Element> privateKey,
const PublicKey<Element> publicKey,
usint rowSize, usint subringDim) const;

/**
* Virtual function to generate the automorphism keys for EvalSumCols; works
* only for packed encoding
*
* @param privateKey private key.
* @param publicKey public key.
* @return returns the evaluation keys
*/
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumColsKeyGen(
const PrivateKey<Element> privateKey) const;
const PrivateKey<Element> privateKey, const PublicKey<Element> publicKey) const;

/**
* Sums all elements in log (batch size) time - works only with packed
Expand Down
19 changes: 18 additions & 1 deletion src/pke/include/schemebase/base-leveledshe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,21 @@ class LeveledSHEBase {
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalAutomorphismKeyGen(
const PrivateKey<Element> privateKey, const std::vector<usint>& indexList) const;

/**
* Virtual function to generate all isomorphism keys for a given private key
*
* @param publicKey encryption key for the new ciphertext.
* @param origPrivateKey original private key used for decryption.
* @param indexList list of automorphism indices to be computed
* @return returns the evaluation keys
*/
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalAutomorphismKeyGen(
const PublicKey<Element> publicKey, const PrivateKey<Element> privateKey,
const std::vector<usint>& indexList) const {
std::string errMsg = "EvalAutomorphismKeyGen is not implemented for this scheme.";
OPENFHE_THROW(not_implemented_error, errMsg);
}

/**
* Virtual function for evaluating automorphism of ciphertext at index i
*
Expand Down Expand Up @@ -597,12 +612,14 @@ class LeveledSHEBase {
* Generates evaluation keys for a list of indices
* Currently works only for power-of-two and cyclic-group cyclotomics
*
* @param publicKey encryption key for the new ciphertext.
* @param origPrivateKey original private key used for decryption.
* @param indexList list of indices to be computed
* @return returns the evaluation keys
*/
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalAtIndexKeyGen(
const PrivateKey<Element> privateKey, const std::vector<int32_t>& indexList) const;
const PublicKey<Element> publicKey, const PrivateKey<Element> privateKey,
const std::vector<int32_t>& indexList) const;

/**
* Moves i-th slot to slot 0
Expand Down
14 changes: 10 additions & 4 deletions src/pke/include/schemebase/base-scheme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,10 @@ class SchemeBase {
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalAutomorphismKeyGen(
const PrivateKey<Element> privateKey, const std::vector<usint>& indexList) const;

virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalAutomorphismKeyGen(
const PublicKey<Element> publicKey, const PrivateKey<Element> privateKey,
const std::vector<usint>& indexList) const;

virtual Ciphertext<Element> EvalAutomorphism(ConstCiphertext<Element> ciphertext, usint i,
const std::map<usint, EvalKey<Element>>& evalKeyMap,
CALLER_INFO_ARGS_HDR) const {
Expand Down Expand Up @@ -946,7 +950,8 @@ class SchemeBase {
}

virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalAtIndexKeyGen(
const PrivateKey<Element> privateKey, const std::vector<int32_t>& indexList) const;
const PublicKey<Element> publicKey, const PrivateKey<Element> privateKey,
const std::vector<int32_t>& indexList) const;

virtual Ciphertext<Element> EvalAtIndex(ConstCiphertext<Element> ciphertext, usint i,
const std::map<usint, EvalKey<Element>>& evalKeyMap) const {
Expand Down Expand Up @@ -1178,14 +1183,15 @@ class SchemeBase {
// Advanced SHE EVAL SUM
/////////////////////////////////////

virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumKeyGen(
const PrivateKey<Element> privateKey) const;
virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumKeyGen(const PrivateKey<Element> privateKey,
const PublicKey<Element> publicKey) const;

virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumRowsKeyGen(const PrivateKey<Element> privateKey,
const PublicKey<Element> publicKey,
usint rowSize, usint subringDim) const;

virtual std::shared_ptr<std::map<usint, EvalKey<Element>>> EvalSumColsKeyGen(
const PrivateKey<Element> privateKey) const;
const PrivateKey<Element> privateKey, const PublicKey<Element> publicKey) const;

virtual Ciphertext<Element> EvalSum(ConstCiphertext<Element> ciphertext, usint batchSize,
const std::map<usint, EvalKey<Element>>& evalKeyMap) const {
Expand Down
Loading