GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpp: Fix GenCardKeyInteractor and extend it

Browse Source 
* NEWS: Mention interface change.
* lang/cpp/src/gpggencardkeyinteractor.cpp
(GpgGenCardKeyInteractor::setAlgo): New.
(GpgGenCardKeyInteractor::action),
(GpgGenCardKeyInteractor::nextState: Handle new interface.

--
Tested that this workes with the old interface of GnuPG 2.2.5
and the new interface since GnuPG 2.2.6

GnuPG-Bug-Id: T4428
This commit is contained in:
Andre Heinecke 2019-03-26 12:02:28 +01:00
parent 129def87b2
commit ffdb75217b
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
3 changed files with 140 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -8,6 +8,7 @@ Noteworthy changes in version 1.12.1 (unreleased)
cpp: Subkey::isBad NEW. cpp: Subkey::isBad NEW.
cpp: UserID::isBad NEW. cpp: UserID::isBad NEW.
cpp: UserID::Signature::isBad NEW. cpp: UserID::Signature::isBad NEW.
cpp: GenCardKeyInteractor::setAlgo NEW.
Noteworthy changes in version 1.12.0 (2018-10-08) Noteworthy changes in version 1.12.0 (2018-10-08)

135
lang/cpp/src/gpggencardkeyinteractor.cpp
View File

@ -36,11 +36,12 @@ using namespace GpgME;
class GpgGenCardKeyInteractor::Private class GpgGenCardKeyInteractor::Private
{ {
public: public:
Private() : keysize("2048"), backup(false) Private() : keysize("2048"), backup(false), algo(RSA)
{ {
} }
std::string name, email, backupFileName, expiry, serial, keysize; std::string name, email, backupFileName, expiry, serial, keysize;
Algo algo;
bool backup; bool backup;
}; };
@ -82,6 +83,11 @@ std::string GpgGenCardKeyInteractor::backupFileName() const
return d->backupFileName; return d->backupFileName;
} }
void GpgGenCardKeyInteractor::setAlgo(Algo algo)
{
d->algo = algo;
}
namespace GpgGenCardKeyInteractor_Private namespace GpgGenCardKeyInteractor_Private
{ {
enum { enum {
@ -104,6 +110,14 @@ enum {
QUIT, QUIT,
SAVE, SAVE,
KEY_ATTR,
KEY_ALGO1,
KEY_ALGO2,
KEY_ALGO3,
KEY_CURVE1,
KEY_CURVE2,
KEY_CURVE3,
ERROR = EditInteractor::ErrorState ERROR = EditInteractor::ErrorState
}; };
} }
@ -118,6 +132,16 @@ const char *GpgGenCardKeyInteractor::action(Error &err) const
return "admin"; return "admin";
case COMMAND: case COMMAND:
return "generate"; return "generate";
case KEY_ATTR:
return "key-attr";
case KEY_ALGO1:
case KEY_ALGO2:
case KEY_ALGO3:
return d->algo == RSA ? "1" : "2";
case KEY_CURVE1:
case KEY_CURVE2:
case KEY_CURVE3:
return "1"; // Only cv25519 supported.
case NAME: case NAME:
return d->name.c_str(); return d->name.c_str();
case EMAIL: case EMAIL:
@ -191,12 +215,92 @@ unsigned int GpgGenCardKeyInteractor::nextState(unsigned int status, const char
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case DO_ADMIN: case DO_ADMIN:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
return KEY_ATTR;
}
err = GENERAL_ERROR;
return ERROR;
// Handling for key-attr subcommand
case KEY_ATTR:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
// Happens if key attr is not yet supported.
return COMMAND;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.algo") == 0) {
return KEY_ALGO1;
}
err = GENERAL_ERROR;
return ERROR;
case KEY_ALGO1:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.size") == 0) {
return SIZE;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "keygen.curve") == 0) {
return KEY_CURVE1;
}
err = GENERAL_ERROR;
return ERROR;
case KEY_ALGO2:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.size") == 0) {
return SIZE2;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "keygen.curve") == 0) {
return KEY_CURVE2;
}
err = GENERAL_ERROR;
return ERROR;
case KEY_ALGO3:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.size") == 0) {
return SIZE3;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "keygen.curve") == 0) {
return KEY_CURVE3;
}
err = GENERAL_ERROR;
return ERROR;
case KEY_CURVE1:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.algo") == 0) {
return KEY_ALGO2;
}
if (status == GPGME_STATUS_GET_LINE && if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) { strcmp(args, "cardedit.prompt") == 0) {
return COMMAND; return COMMAND;
} }
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case KEY_CURVE2:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.algo") == 0) {
return KEY_ALGO3;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
return COMMAND;
}
err = GENERAL_ERROR;
return ERROR;
case KEY_CURVE3:
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.algo") == 0) {
return KEY_ALGO3;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
return COMMAND;
}
err = GENERAL_ERROR;
return ERROR;
// End key-attr handling
case COMMAND: case COMMAND:
if (status == GPGME_STATUS_GET_LINE && if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.backup_enc") == 0) { strcmp(args, "cardedit.genkeys.backup_enc") == 0) {
@ -213,14 +317,21 @@ unsigned int GpgGenCardKeyInteractor::nextState(unsigned int status, const char
strcmp(args, "cardedit.genkeys.size") == 0) { strcmp(args, "cardedit.genkeys.size") == 0) {
return SIZE; return SIZE;
} }
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "keygen.valid") == 0) {
return EXPIRE;
}
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case REPLACE: case REPLACE:
if (status == GPGME_STATUS_GET_LINE && if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.size") == 0) { strcmp(args, "cardedit.genkeys.size") == 0) {
printf("Moving to SIZE\n");
return SIZE; return SIZE;
} }
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "keygen.valid") == 0) {
return EXPIRE;
}
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case SIZE: case SIZE:
@ -232,6 +343,14 @@ unsigned int GpgGenCardKeyInteractor::nextState(unsigned int status, const char
strcmp(args, "keygen.valid") == 0) { strcmp(args, "keygen.valid") == 0) {
return EXPIRE; return EXPIRE;
} }
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.algo") == 0) {
return KEY_ALGO2;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
return COMMAND;
}
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case SIZE2: case SIZE2:
@ -243,6 +362,14 @@ unsigned int GpgGenCardKeyInteractor::nextState(unsigned int status, const char
strcmp(args, "keygen.valid") == 0) { strcmp(args, "keygen.valid") == 0) {
return EXPIRE; return EXPIRE;
} }
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.genkeys.algo") == 0) {
return KEY_ALGO3;
}
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
return COMMAND;
}
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case SIZE3: case SIZE3:
@ -250,6 +377,10 @@ unsigned int GpgGenCardKeyInteractor::nextState(unsigned int status, const char
strcmp(args, "keygen.valid") == 0) { strcmp(args, "keygen.valid") == 0) {
return EXPIRE; return EXPIRE;
} }
if (status == GPGME_STATUS_GET_LINE &&
strcmp(args, "cardedit.prompt") == 0) {
return COMMAND;
}
err = GENERAL_ERROR; err = GENERAL_ERROR;
return ERROR; return ERROR;
case EXPIRE: case EXPIRE:

6
lang/cpp/src/gpggencardkeyinteractor.h
View File

@ -56,6 +56,12 @@ public:
void setDoBackup(bool value); void setDoBackup(bool value);
void setExpiry(const std::string &timeString); void setExpiry(const std::string &timeString);
enum Algo {
RSA = 1,
ECC = 2
};
void setAlgo(Algo algo);
std::string backupFileName() const; std::string backupFileName() const;
private: private: