Browse Subversion Repository
Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/key.c
Parent Directory
| Revision Log
| Patch
| 2067 |
fp = key_fingerprint(ctx->keys[i], SSH_FP_HEX, dgst_alg); |
fp = key_fingerprint(ctx->keys[i], SSH_FP_HEX, dgst_alg); |
| 2068 |
break; |
break; |
| 2069 |
case SSH_DIGEST_SHA256: |
case SSH_DIGEST_SHA256: |
| 2070 |
fp = key_fingerprint(ctx->keys[i], SSH_FP_BASE64, dgst_alg); |
default: |
| 2071 |
|
fp = key_fingerprint(ctx->keys[i], SSH_FP_BASE64, SSH_DIGEST_SHA256); |
| 2072 |
break; |
break; |
| 2073 |
} |
} |
| 2074 |
strncat_s(buf, buf_len, get_sshname_from_key(ctx->keys[i]), _TRUNCATE); |
strncat_s(buf, buf_len, get_sshname_from_key(ctx->keys[i]), _TRUNCATE); |
| 2075 |
strncat_s(buf, buf_len, " ", _TRUNCATE); |
strncat_s(buf, buf_len, " ", _TRUNCATE); |
| 2076 |
strncat_s(buf, buf_len, fp, _TRUNCATE); |
if (fp != NULL) { |
| 2077 |
free(fp); |
strncat_s(buf, buf_len, fp, _TRUNCATE); |
| 2078 |
|
free(fp); |
| 2079 |
|
} |
| 2080 |
if (i < ctx->nkeys - 1) { |
if (i < ctx->nkeys - 1) { |
| 2081 |
strncat_s(buf, buf_len, "\r\n", _TRUNCATE); |
strncat_s(buf, buf_len, "\r\n", _TRUNCATE); |
| 2082 |
} |
} |
| 2095 |
fp = key_fingerprint(ctx->old_keys[i], SSH_FP_HEX, dgst_alg); |
fp = key_fingerprint(ctx->old_keys[i], SSH_FP_HEX, dgst_alg); |
| 2096 |
break; |
break; |
| 2097 |
case SSH_DIGEST_SHA256: |
case SSH_DIGEST_SHA256: |
| 2098 |
fp = key_fingerprint(ctx->old_keys[i], SSH_FP_BASE64, dgst_alg); |
default: |
| 2099 |
|
fp = key_fingerprint(ctx->old_keys[i], SSH_FP_BASE64, SSH_DIGEST_SHA256); |
| 2100 |
break; |
break; |
| 2101 |
} |
} |
| 2102 |
strncat_s(buf, buf_len, get_sshname_from_key(ctx->old_keys[i]), _TRUNCATE); |
strncat_s(buf, buf_len, get_sshname_from_key(ctx->old_keys[i]), _TRUNCATE); |
| 2103 |
strncat_s(buf, buf_len, " ", _TRUNCATE); |
strncat_s(buf, buf_len, " ", _TRUNCATE); |
| 2104 |
strncat_s(buf, buf_len, fp, _TRUNCATE); |
if (fp != NULL) { |
| 2105 |
free(fp); |
strncat_s(buf, buf_len, fp, _TRUNCATE); |
| 2106 |
|
free(fp); |
| 2107 |
|
} |
| 2108 |
if (i < ctx->nold - 1) { |
if (i < ctx->nold - 1) { |
| 2109 |
strncat_s(buf, buf_len, "\r\n", _TRUNCATE); |
strncat_s(buf, buf_len, "\r\n", _TRUNCATE); |
| 2110 |
} |
} |
|
|
Legend:
| Removed from v.6152 |
|
| changed lines |
| |
Added in v.6158 |
|
|
| |