krb5 commit: Remove unused SAM setup code in KDC
Greg Hudson <[email protected]>
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/a980ca16aaf8b4d94f49c4d5da61400d78415a98 commit a980ca16aaf8b4d94f49c4d5da61400d78415a98 Author: Robbie Harwood <[email protected]> Date: Mon Oct 9 14:59:56 2017 -0400 Remove unused SAM setup code in KDC SAM version 1 preauth support was removed in commit 97023f5f10fb091225ad131a0b35f1d91cd12b1e. Remove some lingering KDC code which generated a DES-MD5 key and didn't use it for anything. [[email protected]: edited commit message] src/kdc/extern.c | 1 - src/kdc/extern.h | 1 - src/kdc/main.c | 16 ---------------- 3 files changed, 0 insertions(+), 18 deletions(-) diff --git a/src/kdc/extern.c b/src/kdc/extern.c index 84b5c6a..ff45bf3 100644 --- a/src/kdc/extern.c +++ b/src/kdc/extern.c @@ -37,7 +37,6 @@ kdc_realm_t **kdc_realmlist = (kdc_realm_t **) NULL; int kdc_numrealms = 0; krb5_data empty_string = {0, 0, ""}; -krb5_keyblock psr_key; krb5_int32 max_dgram_reply_size = MAX_DGRAM_SIZE; /* With ts_after(), this is the largest timestamp value. */ diff --git a/src/kdc/extern.h b/src/kdc/extern.h index 7dc658f..78b9f30 100644 --- a/src/kdc/extern.h +++ b/src/kdc/extern.h @@ -29,7 +29,6 @@ /* various externs for KDC */ extern krb5_data empty_string; /* an empty string */ extern krb5_timestamp kdc_infinity; /* greater than all other timestamps */ -extern krb5_keyblock psr_key; /* key for predicted sam response */ extern const int kdc_modifies_kdb; extern krb5_int32 max_dgram_reply_size; /* maximum datagram size */ diff --git a/src/kdc/main.c b/src/kdc/main.c index f2226da..919320d 100644 --- a/src/kdc/main.c +++ b/src/kdc/main.c @@ -53,8 +53,6 @@ extern int daemon(int, int); static void usage (char *); -static krb5_error_code setup_sam (void); - static void initialize_realms(krb5_context kcontext, int argc, char **argv, int *tcp_listen_backlog_out); @@ -590,13 +588,6 @@ create_workers(verto_ctx *ctx, int num) exit(0); } -static krb5_error_code -setup_sam(void) -{ - krb5_context ctx = shandle.kdc_err_context; - return krb5_c_make_random_key(ctx, ENCTYPE_DES_CBC_MD5, &psr_key); -} - static void usage(char *name) { @@ -994,13 +985,6 @@ int main(int argc, char **argv) return 1; } - retval = setup_sam(); - if (retval) { - kdc_err(kcontext, retval, _("while initializing SAM")); - finish_realms(); - return 1; - } - /* Add each realm's listener addresses to the loop. */ for (i = 0; i < shandle.kdc_numrealms; i++) { realm = shandle.kdc_realmlist[i];