projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In openssh_read(), we shouldn't ever return SSH2_WRONG_PASSPHRASE for
[u/mdw/putty]
/
sshaes.c
diff --git
a/sshaes.c
b/sshaes.c
index
44f8ac5
..
97935b7
100644
(file)
--- a/
sshaes.c
+++ b/
sshaes.c
@@
-1097,35
+1097,35
@@
static void aes_sdctr(unsigned char *blk, int len, AESContext *ctx)
memcpy(ctx->iv, iv, sizeof(iv));
}
memcpy(ctx->iv, iv, sizeof(iv));
}
-
static
void *aes_make_context(void)
+void *aes_make_context(void)
{
return snew(AESContext);
}
{
return snew(AESContext);
}
-
static
void aes_free_context(void *handle)
+void aes_free_context(void *handle)
{
sfree(handle);
}
{
sfree(handle);
}
-
static
void aes128_key(void *handle, unsigned char *key)
+void aes128_key(void *handle, unsigned char *key)
{
AESContext *ctx = (AESContext *)handle;
aes_setup(ctx, 16, key, 16);
}
{
AESContext *ctx = (AESContext *)handle;
aes_setup(ctx, 16, key, 16);
}
-
static
void aes192_key(void *handle, unsigned char *key)
+void aes192_key(void *handle, unsigned char *key)
{
AESContext *ctx = (AESContext *)handle;
aes_setup(ctx, 16, key, 24);
}
{
AESContext *ctx = (AESContext *)handle;
aes_setup(ctx, 16, key, 24);
}
-
static
void aes256_key(void *handle, unsigned char *key)
+void aes256_key(void *handle, unsigned char *key)
{
AESContext *ctx = (AESContext *)handle;
aes_setup(ctx, 16, key, 32);
}
{
AESContext *ctx = (AESContext *)handle;
aes_setup(ctx, 16, key, 32);
}
-
static
void aes_iv(void *handle, unsigned char *iv)
+void aes_iv(void *handle, unsigned char *iv)
{
AESContext *ctx = (AESContext *)handle;
int i;
{
AESContext *ctx = (AESContext *)handle;
int i;
@@
-1133,13
+1133,13
@@
static void aes_iv(void *handle, unsigned char *iv)
ctx->iv[i] = GET_32BIT_MSB_FIRST(iv + 4 * i);
}
ctx->iv[i] = GET_32BIT_MSB_FIRST(iv + 4 * i);
}
-
static
void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
+void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
{
AESContext *ctx = (AESContext *)handle;
aes_encrypt_cbc(blk, len, ctx);
}
{
AESContext *ctx = (AESContext *)handle;
aes_encrypt_cbc(blk, len, ctx);
}
-
static
void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len)
+void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len)
{
AESContext *ctx = (AESContext *)handle;
aes_decrypt_cbc(blk, len, ctx);
{
AESContext *ctx = (AESContext *)handle;
aes_decrypt_cbc(blk, len, ctx);
@@
-1157,7
+1157,7
@@
void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
aes_setup(&ctx, 16, key, 32);
memset(ctx.iv, 0, sizeof(ctx.iv));
aes_encrypt_cbc(blk, len, &ctx);
aes_setup(&ctx, 16, key, 32);
memset(ctx.iv, 0, sizeof(ctx.iv));
aes_encrypt_cbc(blk, len, &ctx);
-
memset(&ctx, 0
, sizeof(ctx));
+
smemclr(&ctx
, sizeof(ctx));
}
void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
}
void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
@@
-1166,7
+1166,7
@@
void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
aes_setup(&ctx, 16, key, 32);
memset(ctx.iv, 0, sizeof(ctx.iv));
aes_decrypt_cbc(blk, len, &ctx);
aes_setup(&ctx, 16, key, 32);
memset(ctx.iv, 0, sizeof(ctx.iv));
aes_decrypt_cbc(blk, len, &ctx);
-
memset(&ctx, 0
, sizeof(ctx));
+
smemclr(&ctx
, sizeof(ctx));
}
static const struct ssh2_cipher ssh_aes128_ctr = {
}
static const struct ssh2_cipher ssh_aes128_ctr = {