Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matt Johnston
dropbear
Commits
2259ce4c
Commit
2259ce4c
authored
Mar 20, 2013
by
Matt Johnston
Browse files
Fix "-m none" case and ugly typo
parent
34f9b2a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
common-kex.c
View file @
2259ce4c
...
...
@@ -354,17 +354,17 @@ void gen_new_keys() {
}
}
/* MAC keys */
if
(
ses
.
newkeys
->
trans
.
algo_mac
->
hashdesc
!=
NULL
)
{
hashkeys
(
ses
.
newkeys
->
trans
.
mackey
,
ses
.
newkeys
->
trans
.
algo_mac
->
keysize
,
&
hs
,
mactransletter
);
ses
.
newkeys
->
trans
.
hash_index
=
find_hash
(
ses
.
newkeys
->
trans
.
algo_mac
->
hashdesc
->
name
);
}
if
(
ses
.
newkeys
->
recv
.
algo_mac
->
hashdesc
!=
NULL
)
{
hashkeys
(
ses
.
newkeys
->
recv
.
mackey
,
ses
.
newkeys
->
recv
.
algo_mac
->
keysize
,
&
hs
,
macrecvletter
);
ses
.
newkeys
->
recv
.
hash_index
=
find_hash
(
ses
.
newkeys
->
recv
.
algo_mac
->
hashdesc
->
name
);
}
ses
.
newkeys
->
trans
.
hash_index
=
find_hash
(
ses
.
newkeys
->
trans
.
algo_mac
->
hashdesc
->
name
),
ses
.
newkeys
->
recv
.
hash_index
=
find_hash
(
ses
.
newkeys
->
recv
.
algo_mac
->
hashdesc
->
name
),
#ifndef DISABLE_ZLIB
gen_new_zstreams
();
...
...
session.h
View file @
2259ce4c
...
...
@@ -63,9 +63,9 @@ void cleantext(unsigned char* dirtytext);
/* crypto parameters that are stored individually for transmit and receive */
struct
key_context_directional
{
const
struct
dropbear_cipher
*
algo_crypt
;
/* NULL for none */
const
struct
dropbear_cipher
*
algo_crypt
;
const
struct
dropbear_cipher_mode
*
crypt_mode
;
const
struct
dropbear_hash
*
algo_mac
;
/* NULL for none */
const
struct
dropbear_hash
*
algo_mac
;
int
hash_index
;
/* lookup for libtomcrypt */
char
algo_comp
;
/* compression */
#ifndef DISABLE_ZLIB
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment