diff options
| author | Tom Yu <tlyu@mit.edu> | 1999-08-19 00:25:21 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1999-08-19 00:25:21 +0000 |
| commit | 78c69244d8cedbcedacb20bde288661fd35e6cee (patch) | |
| tree | 7e79271ce6d0f38767222e551f7a595eb6ed9385 /src/krb524 | |
| parent | 1c31ed643221040e7fba7b5c90a72eeb9b71bd15 (diff) | |
| download | krb5-78c69244d8cedbcedacb20bde288661fd35e6cee.tar.gz krb5-78c69244d8cedbcedacb20bde288661fd35e6cee.tar.xz krb5-78c69244d8cedbcedacb20bde288661fd35e6cee.zip | |
* krb524d.c (do_connection): Convert to using new symbol for
DES3.
* cnv_tkt_skey.c (krb524_convert_tkt_skey): Convert to using new
symbol for DES3.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11686 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524')
| -rw-r--r-- | src/krb524/ChangeLog | 8 | ||||
| -rw-r--r-- | src/krb524/cnv_tkt_skey.c | 2 | ||||
| -rw-r--r-- | src/krb524/krb524d.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 8789555524..a080b78311 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,11 @@ +1999-08-18 Tom Yu <tlyu@mit.edu> + + * krb524d.c (do_connection): Convert to using new symbol for + DES3. + + * cnv_tkt_skey.c (krb524_convert_tkt_skey): Convert to using new + symbol for DES3. + 1998-11-13 Theodore Ts'o <tytso@rsts-11.mit.edu> * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c index 4c51b6777f..fc25246cd9 100644 --- a/src/krb524/cnv_tkt_skey.c +++ b/src/krb524/cnv_tkt_skey.c @@ -170,7 +170,7 @@ int krb524_convert_tkt_skey(context, v5tkt, v4tkt, v5_skey, v4_skey, v4_skey->contents); } else { /* Force enctype to be raw if using DES3. */ - if (v4_skey->enctype == ENCTYPE_DES3_HMAC_SHA1 || + if (v4_skey->enctype == ENCTYPE_DES3_CBC_SHA1 || v4_skey->enctype == ENCTYPE_LOCAL_DES3_HMAC_SHA1) v4_skey->enctype = ENCTYPE_DES3_CBC_RAW; ret = krb_cr_tkt_krb5(v4tkt, diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 1afeec2dce..cad0e31609 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -307,7 +307,7 @@ krb5_error_code do_connection(s, context) 0, &v4_service_key, &v4kvno)) && (ret = lookup_service_key(context, v5tkt->server, - ENCTYPE_DES3_HMAC_SHA1, + ENCTYPE_DES3_CBC_SHA1, 0, &v4_service_key, &v4kvno)) && (ret = lookup_service_key(context, v5tkt->server, |