From 0043af68c106de4052a851de5fa59979b9c056fc Mon Sep 17 00:00:00 2001 From: joss17 Date: Thu, 13 Aug 2009 15:10:43 +0000 Subject: [PATCH] changed ctx->current_cert into X509_STORE_CTX_get_current_cert(ctx) according to steve@openssl.org git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1530 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/authgpg.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index 1e69066b4..0c3de8cbe 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -1742,16 +1742,16 @@ int GPGAuthMgr::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx) if ((err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT) || (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY)) { - X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256); + X509_NAME_oneline(X509_get_issuer_name(X509_STORE_CTX_get_current_cert(ctx)), buf, 256); printf("issuer= %s\n", buf); fprintf(stderr, "Doing REAL PGP Certificates\n"); /* do the REAL Authentication */ - if (!AuthX509(ctx->current_cert)) + if (!AuthX509(X509_STORE_CTX_get_current_cert(ctx))) { return false; } - std::string pgpid = getX509CNString(ctx->current_cert->cert_info->issuer); + std::string pgpid = getX509CNString(X509_STORE_CTX_get_current_cert(ctx)->cert_info->issuer); if (!isPGPAuthenticated(pgpid)) { return false; @@ -1761,7 +1761,7 @@ int GPGAuthMgr::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx) else if ((err == X509_V_ERR_CERT_UNTRUSTED) || (err == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE)) { - std::string pgpid = getX509CNString(ctx->current_cert->cert_info->issuer); + std::string pgpid = getX509CNString(X509_STORE_CTX_get_current_cert(ctx)->cert_info->issuer); if (!isPGPAuthenticated(pgpid)) { return false;