ワンタイムパスワード（OTP）での「digits」と「period」を動的に使える様に

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b68a4833e55116e22a6c8949d2bb6ee10ccec63e..8d47f326805316044a4b0786692d6644b3026401 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.6.0
+* ワンタイムパスワード（OTP）での「digits」と「period」を動的に使える様に
+

 # 1.5.0
 * パスワード表示で、「OpenPGP」かどうかの確認の追加
 * 侵害されたパスワードの確認の追加
 # 1.5.0
 * パスワード表示で、「OpenPGP」かどうかの確認の追加
 * 侵害されたパスワードの確認の追加

diff --git a/Makefile b/Makefile
index 1a50eb023453e68948195d0949be9b496e3a5452..ae58f246c54716e4e73a85df36982d0288091dd8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,9 +78,9 @@ CFLAGS += -I/usr/pkg/include -L/usr/pkg/lib
 .endif
 
 .if ${OS} == "haiku"
 .endif
 
 .if ${OS} == "haiku"

-LDFLAGS = -lnetwork -lgpgme -lcrypto
+LDFLAGS = -lm -lnetwork -lgpgme -lcrypto

 .else
 .else

-LDFLAGS = -lgpgme -lcrypto
+LDFLAGS = -lm -lgpgme -lcrypto

 .endif
 
 .if ${OS} == "openbsd"
 .endif
 
 .if ${OS} == "openbsd"

diff --git a/main.c b/main.c
index 2fdce832104881504912f7b96e581ff18cb3692b..3a9df68feb0588ccd93639a91f608f2b2f6d2a37 100644 (file)
--- a/main.c
+++ b/main.c
@@ -14,9 +14,9 @@
 #include <unistd.h>
 
 const char *sofname = "sp";
 #include <unistd.h>
 
 const char *sofname = "sp";

-const char *version = "1.5.0";
+const char *version = "1.6.0";

 const char *avalopt = "abcdefgiloOsvy";
 const char *avalopt = "abcdefgiloOsvy";

-const char *madefor = "simpas 1.1.0";
+const char *madefor = "simpas 1.2.0";

 
 void usage() {
   printf("%s-%s (%s)\nusage: %s [-%s]\n",
 
 void usage() {
   printf("%s-%s (%s)\nusage: %s [-%s]\n",

diff --git a/src/otppass.c b/src/otppass.c
index 514a4efa0168157b0d471e8460359ba39849d2c1..f638ccefe3e29df05efd1bc16d64aaf3f125c553 100644 (file)
--- a/src/otppass.c
+++ b/src/otppass.c
@@ -1,6 +1,8 @@
+#include <math.h>

 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 

+#include <stdlib.h>

 #include <unistd.h>
 
 #if defined(__APPLE)
 #include <unistd.h>
 
 #if defined(__APPLE)


@@ -12,7 +14,35 @@
 #include "common.h"
 #include "otppass.h"
 
 #include "common.h"
 #include "otppass.h"
 

+int otp_digits = 6;
+int otp_period = 30;
+
+int extractIntVal(const char *start, const char *search) {
+  if (start) {
+    start += strlen(search);
+
+    const char *end = strchr(start, '&');
+    if (!end) {
+      end = start + strlen(start);
+    }
+
+    char str[32] = {0};
+    size_t len = end - start;
+    if (len >= sizeof(str)) len = sizeof(str) - 1;
+
+    strncpy(str, start, len);
+    return atoi(str);
+  }
+
+  return 0;
+}
+

 unsigned char *extract_secret(const char *otpauth_url, size_t *decoded_len) {
 unsigned char *extract_secret(const char *otpauth_url, size_t *decoded_len) {

+  otp_digits = extractIntVal(strstr(otpauth_url, "digits="), "digits=");
+  if (otp_digits == 0) otp_digits = 6;
+  otp_period = extractIntVal(strstr(otpauth_url, "period="), "period=");
+  if (otp_period == 0) otp_period = 30;
+

   const char *secret_start = strstr(otpauth_url, "secret=");
   if (!secret_start) {
     if (strncmp(lang, "en", 2) == 0)
   const char *secret_start = strstr(otpauth_url, "secret=");
   if (!secret_start) {
     if (strncmp(lang, "en", 2) == 0)


@@ -104,7 +134,7 @@ uint32_t generate_totp(const char *secret, uint64_t counter) {
     (hash[offset + 2] & 0xFF) << 8 |
     (hash[offset + 3] & 0xFF);
 
     (hash[offset + 2] & 0xFF) << 8 |
     (hash[offset + 3] & 0xFF);
 

-  return truncated_hash % 1000000;
+  return truncated_hash % (uint32_t)pow(10, otp_digits);

 }
 
 void otppass(char *file, int isCopy, int copyTimeout) {
 }
 
 void otppass(char *file, int isCopy, int copyTimeout) {


@@ -195,7 +225,7 @@ void otppass(char *file, int isCopy, int copyTimeout) {
   secret_decoded[decoded_len] = '\0';
 
   time_t current_time = time(NULL);
   secret_decoded[decoded_len] = '\0';
 
   time_t current_time = time(NULL);

-  uint64_t counter = current_time / 30;
+  uint64_t counter = current_time / otp_period;

   uint32_t otp = generate_totp((const char *)secret_decoded, counter);
 
   gpgme_data_release(in);
   uint32_t otp = generate_totp((const char *)secret_decoded, counter);
 
   gpgme_data_release(in);


@@ -205,8 +235,10 @@ void otppass(char *file, int isCopy, int copyTimeout) {
 
   if (isCopy) {
     char cmd[64];
 
   if (isCopy) {
     char cmd[64];

-    if (isGay) snprintf(cmd, sizeof(cmd), "echo -n %06d | wl-copy", otp);
-    else snprintf(cmd, sizeof(cmd), "echo -n %06d | xclip -selection clipboard", otp);
+    if (isGay) snprintf(cmd, sizeof(cmd), "echo -n %0*u | wl-copy", otp_digits, otp);
+    else
+      snprintf(cmd, sizeof(cmd),
+          "echo -n %0*u | xclip -selection clipboard", otp_digits, otp);

 
     int ret = system(cmd);
     if (ret != 0) {
 
     int ret = system(cmd);
     if (ret != 0) {


@@ -237,6 +269,6 @@ void otppass(char *file, int isCopy, int copyTimeout) {
     if (isGay) system("echo -n \"\" | wl-copy");
     else system("echo -n \"\" | xclip -selection clipboard");
   } else {
     if (isGay) system("echo -n \"\" | wl-copy");
     else system("echo -n \"\" | xclip -selection clipboard");
   } else {

-    printf("%06d\n", otp);
+    printf("%0*u\n", otp_digits, otp);

   }
 }
   }
 }

diff --git a/src/otppass.h b/src/otppass.h
index db96da9dd74c765a16cdb721075de91f69ec33ff..fb1ace22b4706913e29f33ad0bab2cb1ce819d50 100644 (file)
--- a/src/otppass.h
+++ b/src/otppass.h
@@ -3,4 +3,7 @@
 
 void otppass(char* file, int isCopy, int copyTimeout);
 
 
 void otppass(char* file, int isCopy, int copyTimeout);
 

+extern int otp_digits;
+extern int otp_period;
+

 #endif
 #endif