diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-16 13:37:16 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-16 13:37:16 +1100 |
commit | 7e8e820153a620ab1dcd81857a7de0969c41d043 (patch) | |
tree | 226cc4185feae97f4069ad60b4c18d259aa5df2f /mpaux.c | |
parent | 4874c79a3a05fc18678d7a85d7091f5139630fac (diff) |
- Merged OpenBSD CVS changes:
- [auth-rh-rsa.c auth-rsa.c authfd.c authfd.h hostfile.c mpaux.c]
[mpaux.h ssh-add.c ssh-agent.c ssh.h ssh.c sshd.c]
the keysize of rsa-parameter 'n' is passed implizit,
a few more checks and warnings about 'pretended' keysizes.
- [cipher.c cipher.h packet.c packet.h sshd.c]
remove support for cipher RC4
- [ssh.c]
a note for legay systems about secuity issues with permanently_set_uid(),
the private hostkey and ptrace()
- [sshconnect.c]
more detailed messages about adding and checking hostkeys
Diffstat (limited to 'mpaux.c')
-rw-r--r-- | mpaux.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -15,7 +15,7 @@ precision integers. | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: mpaux.c,v 1.5 1999/11/12 23:51:58 damien Exp $"); | 18 | RCSID("$Id: mpaux.c,v 1.6 1999/11/16 02:37:16 damien Exp $"); |
19 | 19 | ||
20 | #ifdef HAVE_OPENSSL | 20 | #ifdef HAVE_OPENSSL |
21 | #include <openssl/bn.h> | 21 | #include <openssl/bn.h> |
@@ -33,15 +33,15 @@ RCSID("$Id: mpaux.c,v 1.5 1999/11/12 23:51:58 damien Exp $"); | |||
33 | void | 33 | void |
34 | compute_session_id(unsigned char session_id[16], | 34 | compute_session_id(unsigned char session_id[16], |
35 | unsigned char cookie[8], | 35 | unsigned char cookie[8], |
36 | unsigned int host_key_bits, | ||
37 | BIGNUM *host_key_n, | 36 | BIGNUM *host_key_n, |
38 | unsigned int session_key_bits, | ||
39 | BIGNUM *session_key_n) | 37 | BIGNUM *session_key_n) |
40 | { | 38 | { |
39 | unsigned int host_key_bits = BN_num_bits(host_key_n); | ||
40 | unsigned int session_key_bits = BN_num_bits(session_key_n); | ||
41 | unsigned int bytes = (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8 + 8; | 41 | unsigned int bytes = (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8 + 8; |
42 | unsigned char *buf = xmalloc(bytes); | 42 | unsigned char *buf = xmalloc(bytes); |
43 | MD5_CTX md; | 43 | MD5_CTX md; |
44 | 44 | ||
45 | BN_bn2bin(host_key_n, buf); | 45 | BN_bn2bin(host_key_n, buf); |
46 | BN_bn2bin(session_key_n, buf + (host_key_bits + 7 ) / 8); | 46 | BN_bn2bin(session_key_n, buf + (host_key_bits + 7 ) / 8); |
47 | memcpy(buf + (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8, | 47 | memcpy(buf + (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8, |