tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2003/04/12 10:13:57 

[cipher.c]
     hide cipher details; ok djm@
This commit is contained in:
Damien Miller 2003-05-14 13:41:23 +10:00
parent c652cac5f7
commit a201bb3f8a
2 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,9 @@
[readconf.c] [readconf.c]
strip trailing whitespace from config lines before parsing. strip trailing whitespace from config lines before parsing.
Fixes bz 528; ok markus@ Fixes bz 528; ok markus@
- markus@cvs.openbsd.org 2003/04/12 10:13:57
[cipher.c]
hide cipher details; ok djm@
20030512 20030512
- (djm) Redhat spec: Don't install profile.d scripts when not - (djm) Redhat spec: Don't install profile.d scripts when not
@ -1393,4 +1396,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2678 2003/05/14 03:40:54 djm Exp $ $Id: ChangeLog,v 1.2679 2003/05/14 03:41:23 djm Exp $

103
cipher.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: cipher.c,v 1.62 2002/11/21 22:45:31 markus Exp $"); RCSID("$OpenBSD: cipher.c,v 1.63 2003/04/12 10:13:57 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"
@ -395,6 +395,28 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx)
return (1); return (1);
} }
static void
ssh1_3des_iv(EVP_CIPHER_CTX *evp, int doset, u_char *iv, int len)
{
struct ssh1_3des_ctx *c;
if (len != 24)
fatal("%s: bad 3des iv length: %d", __func__, len);
if ((c = EVP_CIPHER_CTX_get_app_data(evp)) == NULL)
fatal("%s: no 3des context", __func__);
if (doset) {
debug3("%s: Installed 3DES IV", __func__);
memcpy(c->k1.iv, iv, 8);
memcpy(c->k2.iv, iv + 8, 8);
memcpy(c->k3.iv, iv + 16, 8);
} else {
debug3("%s: Copying 3DES IV", __func__);
memcpy(iv, c->k1.iv, 8);
memcpy(iv + 8, c->k2.iv, 8);
memcpy(iv + 16, c->k3.iv, 8);
}
}
static const EVP_CIPHER * static const EVP_CIPHER *
evp_ssh1_3des(void) evp_ssh1_3des(void)
{ {
@ -567,6 +589,19 @@ ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx)
return (1); return (1);
} }
static void
ssh_rijndael_iv(EVP_CIPHER_CTX *evp, int doset, u_char * iv, u_int len)
{
struct ssh_rijndael_ctx *c;
if ((c = EVP_CIPHER_CTX_get_app_data(evp)) == NULL)
fatal("ssh_rijndael_iv: no context");
if (doset)
memcpy(c->r_iv, iv, len);
else
memcpy(iv, c->r_iv, len);
}
static const EVP_CIPHER * static const EVP_CIPHER *
evp_rijndael(void) evp_rijndael(void)
{ {
@ -611,7 +646,6 @@ void
cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len)
{ {
Cipher *c = cc->cipher; Cipher *c = cc->cipher;
u_char *civ = NULL;
int evplen; int evplen;
switch (c->number) { switch (c->number) {
@ -624,45 +658,25 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len)
if (evplen != len) if (evplen != len)
fatal("%s: wrong iv length %d != %d", __func__, fatal("%s: wrong iv length %d != %d", __func__,
evplen, len); evplen, len);
#if OPENSSL_VERSION_NUMBER < 0x00907000L #if OPENSSL_VERSION_NUMBER < 0x00907000L
if (c->evptype == evp_rijndael) { if (c->evptype == evp_rijndael)
struct ssh_rijndael_ctx *aesc; ssh_rijndael_iv(&cc->evp, 0, iv, len);
else
aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp);
if (aesc == NULL)
fatal("%s: no rijndael context", __func__);
civ = aesc->r_iv;
} else
#endif #endif
{ memcpy(iv, cc->evp.iv, len);
civ = cc->evp.iv; break;
} case SSH_CIPHER_3DES:
ssh1_3des_iv(&cc->evp, 0, iv, 24);
break; break;
case SSH_CIPHER_3DES: {
struct ssh1_3des_ctx *desc;
if (len != 24)
fatal("%s: bad 3des iv length: %d", __func__, len);
desc = EVP_CIPHER_CTX_get_app_data(&cc->evp);
if (desc == NULL)
fatal("%s: no 3des context", __func__);
debug3("%s: Copying 3DES IV", __func__);
memcpy(iv, desc->k1.iv, 8);
memcpy(iv + 8, desc->k2.iv, 8);
memcpy(iv + 16, desc->k3.iv, 8);
return;
}
default: default:
fatal("%s: bad cipher %d", __func__, c->number); fatal("%s: bad cipher %d", __func__, c->number);
} }
memcpy(iv, civ, len);
} }
void void
cipher_set_keyiv(CipherContext *cc, u_char *iv) cipher_set_keyiv(CipherContext *cc, u_char *iv)
{ {
Cipher *c = cc->cipher; Cipher *c = cc->cipher;
u_char *div = NULL;
int evplen = 0; int evplen = 0;
switch (c->number) { switch (c->number) {
@ -672,36 +686,19 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv)
evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); evplen = EVP_CIPHER_CTX_iv_length(&cc->evp);
if (evplen == 0) if (evplen == 0)
return; return;
#if OPENSSL_VERSION_NUMBER < 0x00907000L #if OPENSSL_VERSION_NUMBER < 0x00907000L
if (c->evptype == evp_rijndael) { if (c->evptype == evp_rijndael)
struct ssh_rijndael_ctx *aesc; ssh_rijndael_iv(&cc->evp, 1, iv, evplen);
else
aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp);
if (aesc == NULL)
fatal("%s: no rijndael context", __func__);
div = aesc->r_iv;
} else
#endif #endif
{ memcpy(cc->evp.iv, iv, evplen);
div = cc->evp.iv; break;
} case SSH_CIPHER_3DES:
ssh1_3des_iv(&cc->evp, 1, iv, 24);
break; break;
case SSH_CIPHER_3DES: {
struct ssh1_3des_ctx *desc;
desc = EVP_CIPHER_CTX_get_app_data(&cc->evp);
if (desc == NULL)
fatal("%s: no 3des context", __func__);
debug3("%s: Installed 3DES IV", __func__);
memcpy(desc->k1.iv, iv, 8);
memcpy(desc->k2.iv, iv + 8, 8);
memcpy(desc->k3.iv, iv + 16, 8);
return;
}
default: default:
fatal("%s: bad cipher %d", __func__, c->number); fatal("%s: bad cipher %d", __func__, c->number);
} }
memcpy(div, iv, evplen);
} }
#if OPENSSL_VERSION_NUMBER < 0x00907000L #if OPENSSL_VERSION_NUMBER < 0x00907000L