oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use right seal alg, inherit keytype from parent key

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12682 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-08-28 07:55:54 +00:00
parent ea0b1265fa
commit 8a4d53ac23
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gssapi/arcfour.c
View File

@@ -338,7 +338,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
token->SGN_ALG[0] = 0x11; token->SGN_ALG[0] = 0x11;
token->SGN_ALG[1] = 0x00; token->SGN_ALG[1] = 0x00;
if (conf_req_flag) { if (conf_req_flag) {
token->SEAL_ALG[0] = 0x00; token->SEAL_ALG[0] = 0x10;
token->SEAL_ALG[1] = 0x00; token->SEAL_ALG[1] = 0x00;
} else { } else {
token->SEAL_ALG[0] = 0xff; token->SEAL_ALG[0] = 0xff;
@@ -388,7 +388,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
{ {
int i; int i;
Klocal.keytype = KEYTYPE_ARCFOUR; Klocal.keytype = key->keytype;
Klocal.keyvalue.data = Klocaldata; Klocal.keyvalue.data = Klocaldata;
Klocal.keyvalue.length = sizeof(Klocaldata); Klocal.keyvalue.length = sizeof(Klocaldata);
@@ -483,7 +483,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
return GSS_S_BAD_SIG; return GSS_S_BAD_SIG;
p += 2; p += 2;
if (memcmp (p, "\x00\x00", 2) == 0) if (memcmp (p, "\x10\x00", 2) == 0)
conf_flag = 1; conf_flag = 1;
else if (memcmp (p, "\xff\xff", 2) == 0) else if (memcmp (p, "\xff\xff", 2) == 0)
conf_flag = 0; conf_flag = 0;
@@ -527,7 +527,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
{ {
int i; int i;
Klocal.keytype = KEYTYPE_ARCFOUR; Klocal.keytype = key->keytype;
Klocal.keyvalue.data = Klocaldata; Klocal.keyvalue.data = Klocaldata;
Klocal.keyvalue.length = sizeof(Klocaldata); Klocal.keyvalue.length = sizeof(Klocaldata);

8
lib/gssapi/krb5/arcfour.c
View File

@@ -338,7 +338,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
token->SGN_ALG[0] = 0x11; token->SGN_ALG[0] = 0x11;
token->SGN_ALG[1] = 0x00; token->SGN_ALG[1] = 0x00;
if (conf_req_flag) { if (conf_req_flag) {
token->SEAL_ALG[0] = 0x00; token->SEAL_ALG[0] = 0x10;
token->SEAL_ALG[1] = 0x00; token->SEAL_ALG[1] = 0x00;
} else { } else {
token->SEAL_ALG[0] = 0xff; token->SEAL_ALG[0] = 0xff;
@@ -388,7 +388,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
{ {
int i; int i;
Klocal.keytype = KEYTYPE_ARCFOUR; Klocal.keytype = key->keytype;
Klocal.keyvalue.data = Klocaldata; Klocal.keyvalue.data = Klocaldata;
Klocal.keyvalue.length = sizeof(Klocaldata); Klocal.keyvalue.length = sizeof(Klocaldata);
@@ -483,7 +483,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
return GSS_S_BAD_SIG; return GSS_S_BAD_SIG;
p += 2; p += 2;
if (memcmp (p, "\x00\x00", 2) == 0) if (memcmp (p, "\x10\x00", 2) == 0)
conf_flag = 1; conf_flag = 1;
else if (memcmp (p, "\xff\xff", 2) == 0) else if (memcmp (p, "\xff\xff", 2) == 0)
conf_flag = 0; conf_flag = 0;
@@ -527,7 +527,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
{ {
int i; int i;
Klocal.keytype = KEYTYPE_ARCFOUR; Klocal.keytype = key->keytype;
Klocal.keyvalue.data = Klocaldata; Klocal.keyvalue.data = Klocaldata;
Klocal.keyvalue.length = sizeof(Klocaldata); Klocal.keyvalue.length = sizeof(Klocaldata);