[27209] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.11]: Don't expose binary format in preauth otp
daemon@ATHENA.MIT.EDU (Tom Yu)
Tue Oct 30 10:25:14 2012
Date: Tue, 30 Oct 2012 10:25:08 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201210301425.q9UEP8me019460@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/47e4c8a5b638037f029a23129dc4ad344cf5b779
commit 47e4c8a5b638037f029a23129dc4ad344cf5b779
Author: Nathaniel McCallum <npmccallum@redhat.com>
Date: Fri Oct 19 12:00:27 2012 -0400
Don't expose binary format in preauth otp
(cherry picked from commit f2a177ddd2c4be7b2e2579a0bcd9d576a52ca216)
ticket: 7417
version_fixed: 1.11
status: resolved
src/include/krb5/krb5.hin | 1 -
src/lib/krb5/krb/preauth_otp.c | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index e515e8a..6a4f995 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -6408,7 +6408,6 @@ krb5_prompter_posix(krb5_context context, void *data, const char *name,
#define KRB5_RESPONDER_OTP_FORMAT_DECIMAL 0
#define KRB5_RESPONDER_OTP_FORMAT_HEXADECIMAL 1
#define KRB5_RESPONDER_OTP_FORMAT_ALPHANUMERIC 2
-#define KRB5_RESPONDER_OTP_FORMAT_BINARY 3
/**
* This flag indicates that the token value MUST be collected.
diff --git a/src/lib/krb5/krb/preauth_otp.c b/src/lib/krb5/krb/preauth_otp.c
index ef012bd..27157c5 100644
--- a/src/lib/krb5/krb/preauth_otp.c
+++ b/src/lib/krb5/krb/preauth_otp.c
@@ -181,7 +181,8 @@ codec_encode_tokeninfo(krb5_otp_tokeninfo *ti, k5_json_object *out)
if (retval != 0)
goto error;
- if (ti->format != KRB5_OTP_FORMAT_BASE64) {
+ if (ti->format != KRB5_OTP_FORMAT_BASE64 &&
+ ti->format != KRB5_OTP_FORMAT_BINARY) {
retval = codec_int32_to_value(ti->format, obj, "format");
if (retval != 0)
goto error;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
