Tera TermRevision: 7803
https://osdn.net/projects/ttssh2/scm/svn/commits/7803
Author: yutakapon
Date: 2019-06-24 17:01:24 +0900 (Mon, 24 Jun 2019)
Log Message:
-----------
構造体のポインタの指定ミスを修正した。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c
branches/openssl_1_1_1_v2/ttssh2/ttxssh/keyfiles.c
branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c 2019-06-24 07:50:34 UTC (rev 7802)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c 2019-06-24 08:01:24 UTC (rev 7803)
@@ -155,9 +155,9 @@
BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s);
/* sha1 the data */
- EVP_DigestInit(&md, evp_md);
- EVP_DigestUpdate(&md, data, datalen);
- EVP_DigestFinal(&md, digest, &dlen);
+ EVP_DigestInit(md, evp_md);
+ EVP_DigestUpdate(md, data, datalen);
+ EVP_DigestFinal(md, digest, &dlen);
ret = DSA_do_verify(digest, dlen, sig, key);
SecureZeroMemory(digest, sizeof(digest));
@@ -348,9 +348,9 @@
ret = -6;
goto error;
}
- EVP_DigestInit(&md, evp_md);
- EVP_DigestUpdate(&md, data, datalen);
- EVP_DigestFinal(&md, digest, &dlen);
+ EVP_DigestInit(md, evp_md);
+ EVP_DigestUpdate(md, data, datalen);
+ EVP_DigestFinal(md, digest, &dlen);
ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key);
@@ -437,9 +437,9 @@
ret = -8;
goto error;
}
- EVP_DigestInit(&md, evp_md);
- EVP_DigestUpdate(&md, data, datalen);
- EVP_DigestFinal(&md, digest, &dlen);
+ EVP_DigestInit(md, evp_md);
+ EVP_DigestUpdate(md, data, datalen);
+ EVP_DigestFinal(md, digest, &dlen);
ret = ECDSA_do_verify(digest, dlen, sig, key);
SecureZeroMemory(digest, sizeof(digest));
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/keyfiles.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/keyfiles.c 2019-06-24 07:50:34 UTC (rev 7802)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/keyfiles.c 2019-06-24 08:01:24 UTC (rev 7803)
@@ -560,7 +560,7 @@
cipher_init_SSH2(cipher_ctx, key, keylen, key + keylen, ivlen, CIPHER_DECRYPT,
get_cipher_EVP_CIPHER(cipher), 0, 0, pvar);
if (EVP_Cipher(cipher_ctx, cp, buffer_tail_ptr(copy_consumed), len) == 0) {
- cipher_cleanup_SSH2(&cipher_ctx);
+ cipher_cleanup_SSH2(cipher_ctx);
goto error;
}
cipher_cleanup_SSH2(cipher_ctx);
@@ -1053,23 +1053,23 @@
for (i = 0; i < sizeof(mackey) && i < sizeof(foo); i++) {
foo[i] ^= mackey[i];
}
- EVP_DigestInit(&ctx[0], md);
- EVP_DigestUpdate(&ctx[0], foo, sizeof(foo));
+ EVP_DigestInit(ctx[0], md);
+ EVP_DigestUpdate(ctx[0], foo, sizeof(foo));
memset(foo, 0x5C, sizeof(foo));
for (i = 0; i < sizeof(mackey) && i < sizeof(foo); i++) {
foo[i] ^= mackey[i];
}
- EVP_DigestInit(&ctx[1], md);
- EVP_DigestUpdate(&ctx[1], foo, sizeof(foo));
+ EVP_DigestInit(ctx[1], md);
+ EVP_DigestUpdate(ctx[1], foo, sizeof(foo));
memset(foo, 0, sizeof(foo));
- EVP_DigestUpdate(&ctx[0], macdata->buf, macdata->len);
- EVP_DigestFinal(&ctx[0], intermediate, &len);
+ EVP_DigestUpdate(ctx[0], macdata->buf, macdata->len);
+ EVP_DigestFinal(ctx[0], intermediate, &len);
- EVP_DigestUpdate(&ctx[1], intermediate, sizeof(intermediate));
- EVP_DigestFinal(&ctx[1], binary, &len);
+ EVP_DigestUpdate(ctx[1], intermediate, sizeof(intermediate));
+ EVP_DigestFinal(ctx[1], binary, &len);
EVP_MD_CTX_free(ctx[0]);
EVP_MD_CTX_free(ctx[1]);
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c 2019-06-24 07:50:34 UTC (rev 7802)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c 2019-06-24 08:01:24 UTC (rev 7803)
@@ -3670,9 +3670,9 @@
struct ssh1_3des_ctx *c;
if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) {
- EVP_CIPHER_CTX_cleanup(&c->k1);
- EVP_CIPHER_CTX_cleanup(&c->k2);
- EVP_CIPHER_CTX_cleanup(&c->k3);
+ EVP_CIPHER_CTX_cleanup(c->k1);
+ EVP_CIPHER_CTX_cleanup(c->k2);
+ EVP_CIPHER_CTX_cleanup(c->k3);
SecureZeroMemory(c, sizeof(*c));
free(c);
EVP_CIPHER_CTX_set_app_data(ctx, NULL);