krb5 commit: Remove stub pkinit_win2k code
Greg Hudson
ghudson at MIT.EDU
Wed Jun 11 16:45:05 EDT 2014
https://github.com/krb5/krb5/commit/08bdd2e94157146ed35384c4d01639338d766f0f
commit 08bdd2e94157146ed35384c4d01639338d766f0f
Author: Greg Hudson <ghudson at mit.edu>
Date: Fri Jun 6 17:56:23 2014 -0400
Remove stub pkinit_win2k code
As contributed, the PKINIT module contained code to read the
pkinit_win2k variable, but never used it. Get rid of the structure
field and the code to populate it.
src/plugins/preauth/pkinit/pkinit.h | 2 --
src/plugins/preauth/pkinit/pkinit_clnt.c | 4 ----
src/plugins/preauth/pkinit/pkinit_lib.c | 1 -
3 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
index efaa162..328dee5 100644
--- a/src/plugins/preauth/pkinit/pkinit.h
+++ b/src/plugins/preauth/pkinit/pkinit.h
@@ -92,7 +92,6 @@ extern int longhorn; /* XXX Talking to a Longhorn server? */
#define KRB5_CONF_PKINIT_POOL "pkinit_pool"
#define KRB5_CONF_PKINIT_REQUIRE_CRL_CHECKING "pkinit_require_crl_checking"
#define KRB5_CONF_PKINIT_REVOKE "pkinit_revoke"
-#define KRB5_CONF_PKINIT_WIN2K "pkinit_win2k"
#define KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING "pkinit_win2k_require_binding"
/* Make pkiDebug(fmt,...) print, or not. */
@@ -178,7 +177,6 @@ typedef struct _pkinit_req_opts {
int require_crl_checking;
int dh_size; /* initial request DH modulus size (default=1024) */
int require_hostname_match;
- int win2k_target;
int win2k_require_cksum;
} pkinit_req_opts;
diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
index 55b3881..b1c92dd 100644
--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
+++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
@@ -949,10 +949,6 @@ pkinit_client_profile(krb5_context context,
context, plgctx, reqctx, realm);
pkinit_libdefault_boolean(context, realm,
- KRB5_CONF_PKINIT_WIN2K,
- reqctx->opts->win2k_target,
- &reqctx->opts->win2k_target);
- pkinit_libdefault_boolean(context, realm,
KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING,
reqctx->opts->win2k_require_cksum,
&reqctx->opts->win2k_require_cksum);
diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c
index a7bf54e..1cbbed7 100644
--- a/src/plugins/preauth/pkinit/pkinit_lib.c
+++ b/src/plugins/preauth/pkinit/pkinit_lib.c
@@ -63,7 +63,6 @@ pkinit_init_req_opts(pkinit_req_opts **reqopts)
opts->dh_or_rsa = DH_PROTOCOL;
opts->require_crl_checking = 0;
opts->dh_size = PKINIT_DEFAULT_DH_MIN_BITS;
- opts->win2k_target = 0;
opts->win2k_require_cksum = 0;
*reqopts = opts;
More information about the cvs-krb5
mailing list