svnno****@sourc*****
svnno****@sourc*****
2015年 11月 12日 (木) 23:33:12 JST
Tera TermRevision: 6118
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6118
Author: maya
Date: 2015-11-12 23:33:12 +0900 (Thu, 12 Nov 2015)
Log Message:
-----------
SSH key fingerprint を base64 形式で出力する関数を追加
Modified Paths:
--------------
trunk/ttssh2/ttxssh/key.c
trunk/ttssh2/ttxssh/ssh.h
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2015-11-11 22:38:30 UTC (rev 6117)
+++ trunk/ttssh2/ttxssh/key.c 2015-11-12 14:33:12 UTC (rev 6118)
@@ -32,6 +32,7 @@
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/ecdsa.h>
+#include <openssl/buffer.h>
#define INTBLOB_LEN 20
#define SIGBLOB_LEN (2*INTBLOB_LEN)
@@ -667,11 +668,43 @@
}
static char *
-key_fingerprint_hash(u_char *dgst_raw, u_int dgst_raw_len)
+key_fingerprint_b64(u_char *dgst_raw, u_int dgst_raw_len)
{
char *retval;
unsigned int i, retval_len;
+ BIO *bio, *b64;
+ BUF_MEM *bufferPtr;
+ retval_len = ((dgst_raw_len + 2) / 3) * 4 + 1;
+ retval = malloc(retval_len);
+ retval[0] = '\0';
+
+ b64 = BIO_new(BIO_f_base64());
+ bio = BIO_new(BIO_s_mem());
+ bio = BIO_push(b64, bio);
+
+ BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL);
+ BIO_write(bio, dgst_raw, dgst_raw_len);
+ BIO_flush(bio);
+ BIO_get_mem_ptr(bio, &bufferPtr);
+ strncat_s(retval, retval_len, bufferPtr->data, _TRUNCATE);
+ BIO_set_close(bio, BIO_NOCLOSE);
+ BIO_free_all(bio);
+
+ /* Remove the trailing '=' character */
+ for (i = strlen(retval) - 1; retval[i] == '='; i--) {
+ retval[i] = '\0';
+ }
+
+ return (retval);
+}
+
+static char *
+key_fingerprint_hex(u_char *dgst_raw, u_int dgst_raw_len)
+{
+ char *retval;
+ unsigned int i, retval_len;
+
retval_len = dgst_raw_len * 3 + 1;
retval = malloc(retval_len);
retval[0] = '\0';
@@ -785,14 +818,16 @@
if (dgst_raw == NULL)
return NULL;
- if (dgst_rep == SSH_FP_HEX) {
- retval = key_fingerprint_hash(dgst_raw, dgst_raw_len);
-
- } else if (dgst_rep == SSH_FP_RANDOMART) {
+ switch (dgst_rep) {
+ case SSH_FP_HEX:
+ retval = key_fingerprint_hex(dgst_raw, dgst_raw_len);
+ break;
+ case SSH_FP_BASE64:
+ retval = key_fingerprint_b64(dgst_raw, dgst_raw_len);
+ break;
+ case SSH_FP_RANDOMART:
retval = key_fingerprint_randomart(dgst_raw, dgst_raw_len, key);
-
- } else {
-
+ break;
}
memset(dgst_raw, 0, dgst_raw_len);
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2015-11-11 22:38:30 UTC (rev 6117)
+++ trunk/ttssh2/ttxssh/ssh.h 2015-11-12 14:33:12 UTC (rev 6118)
@@ -529,7 +529,9 @@
// fingerprint\x82̎\xED\x95\xCA
enum fp_rep {
+ SSH_FP_DEFAULT = 0,
SSH_FP_HEX,
+ SSH_FP_BASE64,
SSH_FP_BUBBLEBABBLE,
SSH_FP_RANDOMART
};