[29905] in CVS-changelog-for-Kerberos-V5
krb5 commit: Port pkinit debug code to OpenSSL 1.1.0 API
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Apr 10 12:55:09 2017
Date: Mon, 10 Apr 2017 12:55:04 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201704101655.v3AGt4mt014603@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/0daf1d9750b8e6f96f51261bbec87c5eb51c0598
commit 0daf1d9750b8e6f96f51261bbec87c5eb51c0598
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 16 16:39:46 2017 +0100
Port pkinit debug code to OpenSSL 1.1.0 API
[ghudson@mit.edu: added intermediate variables to simplify code]
src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
index 8bd8aa5..b583ff0 100644
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -3572,12 +3572,14 @@ openssl_callback(int ok, X509_STORE_CTX * ctx)
{
#ifdef DEBUG
if (!ok) {
+ X509 *cert = X509_STORE_CTX_get_current_cert(ctx);
+ int err = X509_STORE_CTX_get_error(ctx);
+ const char *errmsg = X509_verify_cert_error_string(err);
char buf[DN_BUF_LEN];
- X509_NAME_oneline(X509_get_subject_name(ctx->current_cert), buf, sizeof(buf));
+ X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
pkiDebug("cert = %s\n", buf);
- pkiDebug("callback function: %d (%s)\n", ctx->error,
- X509_verify_cert_error_string(ctx->error));
+ pkiDebug("callback function: %d (%s)\n", err, errmsg);
}
#endif
return ok;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
