diff options
| author | Saturneric <[email protected]> | 2022-12-22 10:30:36 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-12-22 10:30:36 +0000 |
| commit | 3cb623b07e50d9e95dace9966dc0337e72f57dc2 (patch) | |
| tree | dfe994f28f0a6dee6151febf3b50f22adceab74e /src/core/GpgGenKeyInfo.h | |
| parent | Merge pull request #70 from saturneric/dev/2.0.8/saturneric (diff) | |
| parent | fix: continue to solve ubuntu 18.04 build issues (diff) | |
| download | GpgFrontend-2.0.10.tar.gz GpgFrontend-2.0.10.zip | |
fix: solve conflictsv2.0.10
Diffstat (limited to '')
| -rw-r--r-- | src/core/GpgGenKeyInfo.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/GpgGenKeyInfo.h b/src/core/GpgGenKeyInfo.h index 73dd9680..d47b803e 100644 --- a/src/core/GpgGenKeyInfo.h +++ b/src/core/GpgGenKeyInfo.h @@ -62,34 +62,36 @@ class GPGFRONTEND_CORE_EXPORT GenKeyInfo { std::string passphrase_; ///< + using KeyGenAlgo = std::pair<std::string, std::string>; + public: /** * @brief Get the Supported Key Algo object * * @return const std::vector<std::string>& */ - static const std::vector<std::string> &GetSupportedKeyAlgo(); + static const std::vector<KeyGenAlgo> &GetSupportedKeyAlgo(); /** * @brief Get the Supported Subkey Algo object * * @return const std::vector<std::string>& */ - static const std::vector<std::string> &GetSupportedSubkeyAlgo(); + static const std::vector<KeyGenAlgo> &GetSupportedSubkeyAlgo(); /** * @brief Get the Supported Key Algo Standalone object * * @return const std::vector<std::string>& */ - static const std::vector<std::string> &GetSupportedKeyAlgoStandalone(); + static const std::vector<KeyGenAlgo> &GetSupportedKeyAlgoStandalone(); /** * @brief Get the Supported Subkey Algo Standalone object * * @return const std::vector<std::string>& */ - static const std::vector<std::string> &GetSupportedSubkeyAlgoStandalone(); + static const std::vector<KeyGenAlgo> &GetSupportedSubkeyAlgoStandalone(); /** * @brief @@ -171,7 +173,7 @@ class GPGFRONTEND_CORE_EXPORT GenKeyInfo { * * @param m_algo */ - void SetAlgo(const std::string &m_algo); + void SetAlgo(const GpgFrontend::GenKeyInfo::KeyGenAlgo &m_algo); /** * @brief Get the Key Size Str object |