Move all keyring management functions to a separate class.

KeyringIO imports, creates and deletes keys. Everything is declared
private in this class, and it can be called by K7Main only.
This commit is contained in:
SET
2020-11-14 10:44:52 +01:00
parent 2b6c0960be
commit bb4df1423a
8 changed files with 387 additions and 245 deletions

View File

@@ -40,6 +40,7 @@ OBJECTFILES= \
${OBJECTDIR}/GpgMEWorker.o \
${OBJECTDIR}/K7Main.o \
${OBJECTDIR}/KeyEdit.o \
${OBJECTDIR}/KeyringIO.o \
${OBJECTDIR}/LoopbackPassphraseProvider.o \
${OBJECTDIR}/PopupCertifyUserId.o \
${OBJECTDIR}/PopupCreate.o \
@@ -101,6 +102,11 @@ ${OBJECTDIR}/KeyEdit.o: KeyEdit.cpp
${RM} "$@.d"
$(COMPILE.cc) -O2 -s -DLARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I/usr/local/Wt/include -I/usr/include/gpgme++ -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/KeyEdit.o KeyEdit.cpp
${OBJECTDIR}/KeyringIO.o: KeyringIO.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
$(COMPILE.cc) -O2 -s -DLARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I/usr/local/Wt/include -I/usr/include/gpgme++ -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/KeyringIO.o KeyringIO.cpp
${OBJECTDIR}/LoopbackPassphraseProvider.o: LoopbackPassphraseProvider.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"

View File

@@ -40,6 +40,7 @@ OBJECTFILES= \
${OBJECTDIR}/GpgMEWorker.o \
${OBJECTDIR}/K7Main.o \
${OBJECTDIR}/KeyEdit.o \
${OBJECTDIR}/KeyringIO.o \
${OBJECTDIR}/LoopbackPassphraseProvider.o \
${OBJECTDIR}/PopupCertifyUserId.o \
${OBJECTDIR}/PopupCreate.o \
@@ -101,6 +102,11 @@ ${OBJECTDIR}/KeyEdit.o: KeyEdit.cpp
${RM} "$@.d"
$(COMPILE.cc) -g -DDEVTIME -I/usr/local/Wt-Debug/include -I/usr/include/gpgme++ -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/KeyEdit.o KeyEdit.cpp
${OBJECTDIR}/KeyringIO.o: KeyringIO.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
$(COMPILE.cc) -g -DDEVTIME -I/usr/local/Wt-Debug/include -I/usr/include/gpgme++ -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/KeyringIO.o KeyringIO.cpp
${OBJECTDIR}/LoopbackPassphraseProvider.o: LoopbackPassphraseProvider.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"

View File

@@ -40,6 +40,7 @@ OBJECTFILES= \
${OBJECTDIR}/GpgMEWorker.o \
${OBJECTDIR}/K7Main.o \
${OBJECTDIR}/KeyEdit.o \
${OBJECTDIR}/KeyringIO.o \
${OBJECTDIR}/LoopbackPassphraseProvider.o \
${OBJECTDIR}/PopupCertifyUserId.o \
${OBJECTDIR}/PopupCreate.o \
@@ -101,6 +102,11 @@ ${OBJECTDIR}/KeyEdit.o: KeyEdit.cpp
${RM} "$@.d"
$(COMPILE.cc) -O2 -s -I/usr/local/Wt/include -I/usr/include/gpgme++ -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/KeyEdit.o KeyEdit.cpp
${OBJECTDIR}/KeyringIO.o: KeyringIO.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
$(COMPILE.cc) -O2 -s -I/usr/local/Wt/include -I/usr/include/gpgme++ -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/KeyringIO.o KeyringIO.cpp
${OBJECTDIR}/LoopbackPassphraseProvider.o: LoopbackPassphraseProvider.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"

View File

@@ -9,6 +9,7 @@
<itemPath>GpgMEWorker.h</itemPath>
<itemPath>K7Main.h</itemPath>
<itemPath>KeyEdit.h</itemPath>
<itemPath>KeyringIO.h</itemPath>
<itemPath>LoopbackPassphraseProvider.h</itemPath>
<itemPath>PopupCertifyUserId.h</itemPath>
<itemPath>PopupCreate.h</itemPath>
@@ -36,6 +37,7 @@
<itemPath>GpgMEWorker.cpp</itemPath>
<itemPath>K7Main.cpp</itemPath>
<itemPath>KeyEdit.cpp</itemPath>
<itemPath>KeyringIO.cpp</itemPath>
<itemPath>LoopbackPassphraseProvider.cpp</itemPath>
<itemPath>PopupCertifyUserId.cpp</itemPath>
<itemPath>PopupCreate.cpp</itemPath>
@@ -58,17 +60,6 @@
kind="IMPORTANT_FILES_FOLDER">
<itemPath>Makefile</itemPath>
</logicalFolder>
<logicalFolder name="TestFiles"
displayName="Test Files"
projectFiles="false"
kind="TEST_LOGICAL_FOLDER">
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
projectFiles="false"
kind="IMPORTANT_FILES_FOLDER">
<itemPath>Makefile</itemPath>
</logicalFolder>
</logicalFolder>
<projectmakefile>Makefile</projectmakefile>
<confs>
@@ -121,6 +112,10 @@
</item>
<item path="KeyEdit.h" ex="false" tool="3" flavor2="0">
</item>
<item path="KeyringIO.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="KeyringIO.h" ex="false" tool="3" flavor2="0">
</item>
<item path="LoopbackPassphraseProvider.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="LoopbackPassphraseProvider.h" ex="false" tool="3" flavor2="0">
@@ -229,6 +224,10 @@
</item>
<item path="KeyEdit.h" ex="false" tool="3" flavor2="0">
</item>
<item path="KeyringIO.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="KeyringIO.h" ex="false" tool="3" flavor2="0">
</item>
<item path="LoopbackPassphraseProvider.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="LoopbackPassphraseProvider.h" ex="false" tool="3" flavor2="0">
@@ -341,6 +340,10 @@
</item>
<item path="KeyEdit.h" ex="false" tool="3" flavor2="0">
</item>
<item path="KeyringIO.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="KeyringIO.h" ex="false" tool="3" flavor2="0">
</item>
<item path="LoopbackPassphraseProvider.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="LoopbackPassphraseProvider.h" ex="false" tool="3" flavor2="0">