From f01bf9e837001ad1724a493483cc992c2063ed3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 28 Sep 2021 15:14:18 +0200 Subject: [PATCH] Fix a bug : export key doesn't supports output in a target file --- include/libgourou.h | 2 +- utils/acsmdownloader.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/libgourou.h b/include/libgourou.h index ce9892e..dea43a0 100644 --- a/include/libgourou.h +++ b/include/libgourou.h @@ -40,7 +40,7 @@ #define ACS_SERVER "http://adeactivate.adobe.com/adept" #endif -#define LIBGOUROU_VERSION "0.4" +#define LIBGOUROU_VERSION "0.4.1" namespace gourou { diff --git a/utils/acsmdownloader.cpp b/utils/acsmdownloader.cpp index 9c915fc..ef55a0e 100644 --- a/utils/acsmdownloader.cpp +++ b/utils/acsmdownloader.cpp @@ -79,6 +79,8 @@ public: std::string filename; if (!outputFile) filename = std::string("Adobe_PrivateLicenseKey--") + user->getUsername() + ".der"; + else + filename = outputFile; if (outputDir) { @@ -173,7 +175,7 @@ static void usage(const char* cmd) { std::cout << "Download EPUB file from ACSM request file" << std::endl; - std::cout << "Usage: " << cmd << " [(-d|--device-file) device.xml] [(-a|--activation-file) activation.xml] [(-s|--device-key-file) devicesalt] [(-O|--output-dir) dir] [(-o|--output-file) output(.epub|.pdf|.der)] [(-v|--verbose)] [(-h|--help)] (-f|--acsm-file) file.acsm|(-e|--export-private-key)" << std::endl << std::endl; + std::cout << "Usage: " << cmd << " [(-d|--device-file) device.xml] [(-a|--activation-file) activation.xml] [(-k|--device-key-file) devicesalt] [(-O|--output-dir) dir] [(-o|--output-file) output(.epub|.pdf|.der)] [(-v|--verbose)] [(-h|--help)] (-f|--acsm-file) file.acsm|(-e|--export-private-key)" << std::endl << std::endl; std::cout << " " << "-d|--device-file" << "\t" << "device.xml file from eReader" << std::endl; std::cout << " " << "-a|--activation-file" << "\t" << "activation.xml file from eReader" << std::endl;