From 7cc2aa0582748cb49b438e11da207b342b1309a4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 8 Dec 2011 01:30:53 +0000 Subject: [PATCH] whoops, fix compile on unrelated change that snuck in changelog tbd SVN revision: 66004 --- legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c index 2e777a29eb..e96e1f09d9 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c @@ -1411,21 +1411,21 @@ _ecore_con_ssl_server_init_openssl(Ecore_Con_Server *svr) { char *c; size_t clen; - ASN1_OBJECT *obj = NULL; + int name = 0; if (svr->verify) SSL_ERROR_CHECK_GOTO_ERROR(SSL_get_verify_result(svr->ssl)); clen = X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_subject_alt_name, NULL, 0); if (clen) - obj = NID_subject_alt_name; + name = NID_subject_alt_name; else clen = X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, NULL, 0); SSL_ERROR_CHECK_GOTO_ERROR(!clen); - if (!obj) obj = NID_commonName; + if (!name) name = NID_commonName; c = alloca(++clen); - X509_NAME_get_text_by_NID(X509_get_subject_name(cert), obj, c, clen); + X509_NAME_get_text_by_NID(X509_get_subject_name(cert), name, c, clen); INF("CERT NAME: %s\n", c); - SSL_ERROR_CHECK_GOTO_ERROR(!_openssl_name_verify(buf, svr->verify_name ?: svr->name)); + SSL_ERROR_CHECK_GOTO_ERROR(!_openssl_name_verify(c, svr->verify_name ?: svr->name)); } }