aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2020-07-28 13:21:33 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2020-07-28 13:21:33 +0200
commit882bdd78f217b994066b78e21f9c64fd396206cc (patch)
treebf6a9d70aca43ecd0eb4e5731ccd50b92989c74b
parent24221fd2acd211e19c13515cc1f121cc5951445b (diff)
downloadlibnitrokey-882bdd78f217b994066b78e21f9c64fd396206cc.tar.gz
libnitrokey-882bdd78f217b994066b78e21f9c64fd396206cc.tar.bz2
Move missing auth function to OTP unit
-rw-r--r--NitrokeyManager.cc14
-rw-r--r--NitrokeyManagerOTP.cc15
2 files changed, 15 insertions, 14 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index fa12a5e..0d566d2 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -20,6 +20,7 @@
*/
#include "libnitrokey/NitrokeyManager.h"
+#include "NitrokeyManager.h"
#include "NitrokeyManagerOTP.h"
#include "NitrokeyManagerPWS.h"
#include "libnitrokey/LibraryException.h"
@@ -41,19 +42,6 @@ namespace nitrokey{
using nitrokey::misc::strcpyT;
-
- // package type to auth, auth type [Authorize,UserAuthorize]
- template <typename S, typename A, typename T>
- void NitrokeyManager::authorize_packet(T &package, const char *admin_temporary_password, shared_ptr<Device> device){
- if (!is_authorization_command_supported()){
- LOG("Authorization command not supported, skipping", Loglevel::WARNING);
- }
- auto auth = get_payload<A>();
- strcpyT(auth.temporary_password, admin_temporary_password);
- auth.crc_to_authorize = S::CommandTransaction::getCRC(package);
- A::CommandTransaction::run(device, auth);
- }
-
shared_ptr <NitrokeyManager> NitrokeyManager::_instance = nullptr;
NitrokeyManager::NitrokeyManager() : device(nullptr)
diff --git a/NitrokeyManagerOTP.cc b/NitrokeyManagerOTP.cc
index 93f2188..42eb3a9 100644
--- a/NitrokeyManagerOTP.cc
+++ b/NitrokeyManagerOTP.cc
@@ -324,4 +324,17 @@ nitrokey::NitrokeyManager::get_OTP_slot_data(const uint8_t slot_number) {
}
nitrokey::proto::stick10::ReadSlot::ResponsePayload nitrokey::NitrokeyManager::get_HOTP_slot_data(const uint8_t slot_number) {
return get_OTP_slot_data(get_internal_slot_number_for_hotp(slot_number));
- } \ No newline at end of file
+ }
+ namespace nitrokey { // package type to auth, auth type
+ // [Authorize,UserAuthorize]
+ template <typename S, typename A, typename T>
+ void NitrokeyManager::authorize_packet(T &package, const char *admin_temporary_password, shared_ptr<Device> device){
+ if (!is_authorization_command_supported()){
+ LOG("Authorization command not supported, skipping", Loglevel::WARNING);
+ }
+ auto auth = get_payload<A>();
+ strcpyT(auth.temporary_password, admin_temporary_password);
+ auth.crc_to_authorize = S::CommandTransaction::getCRC(package);
+ A::CommandTransaction::run(device, auth);
+ }
+ } // namespace nitrokey \ No newline at end of file