1.6.13

uplusware · uplusware · commit c2f5766301ae · 2022-01-07T21:14:58.000+08:00
1.6.13
diff --git a/src/Makefile.centos b/src/Makefile.centos
diff --git a/src/imap.cpp b/src/imap.cpp
@@ -575,7 +575,7 @@ BOOL CMailImap::On_Authenticate(char* text)
                     if(!e)
                         break;
                     ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);
-                    char *commonName = (char*)ASN1_STRING_data(d);
+                    const char *commonName = (const char*)ASN1_STRING_get0_data(d);
                     
                     if(strMailAddr == "")
                     {
diff --git a/src/pop.cpp b/src/pop.cpp
@@ -1123,7 +1123,7 @@ void CMailPop::On_Auth_Handler(char* text)
                     if(!e)
                         break;
                     ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);
-                    char *commonName = (char*)ASN1_STRING_data(d);
+                    const char *commonName = (const char*)ASN1_STRING_get0_data(d);
                     
                     if(strMailAddr == "")
                     {
diff --git a/src/smtp.cpp b/src/smtp.cpp
@@ -614,7 +614,7 @@ void CMailSmtp::On_Auth_Handler(char* text)
                     if(!e)
                         break;
                     ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);
-                    char *commonName = (char*)ASN1_STRING_data(d);
+                    const char *commonName = (const char*)ASN1_STRING_get0_data(d);
                     
                     if(strMailAddr == "")
                     {
@@ -1807,7 +1807,7 @@ BOOL CMailSmtp::On_Helo_Handler(char* text)
                 if(!e)
                     break;
                 ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);
-                char *commonName = (char*)ASN1_STRING_data(d);
+                const char *commonName = (const char*)ASN1_STRING_get0_data(d);
                 
                 if(strcasecmp(commonName, m_helo_argument.c_str()) == 0 || strmatch(commonName, m_helo_argument.c_str()))
                 {
@@ -2075,7 +2075,7 @@ void CMailSmtp::On_STARTTLS_Handler()
                 if(!e)
                     break;
                 ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);
-                char *commonName = (char*)ASN1_STRING_data(d);
+                const char *commonName = (const char*)ASN1_STRING_get0_data(d);
                 
                 if(strcasecmp(commonName, m_helo_argument.c_str()) == 0 || strmatch(commonName, m_helo_argument.c_str()))
                 {
diff --git a/src/xmpp.cpp b/src/xmpp.cpp
@@ -2804,7 +2804,7 @@ BOOL CXmpp::AuthTag(TiXmlDocument* xmlDoc)
                         if(!e)
                             break;
                         ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);
-                        char *commonName = (char*)ASN1_STRING_data(d);
+                        const char *commonName = (const char*)ASN1_STRING_get0_data(d);
                         if(strMailAddr == "")
                         {
                             if(m_is_srv2srv_conn)

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ BOOL CMailImap::On_Authenticate(char* text)`
`575`	`575`	`if(!e)`
`576`	`576`	`break;`
`577`	`577`	`ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);`
`578`		`- char commonName = (char)ASN1_STRING_data(d);`
	`578`	`+ const char commonName = (const char)ASN1_STRING_get0_data(d);`
`579`	`579`
`580`	`580`	`if(strMailAddr == "")`
`581`	`581`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1123,7 +1123,7 @@ void CMailPop::On_Auth_Handler(char* text)`
`1123`	`1123`	`if(!e)`
`1124`	`1124`	`break;`
`1125`	`1125`	`ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);`
`1126`		`- char commonName = (char)ASN1_STRING_data(d);`
	`1126`	`+ const char commonName = (const char)ASN1_STRING_get0_data(d);`
`1127`	`1127`
`1128`	`1128`	`if(strMailAddr == "")`
`1129`	`1129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2804,7 +2804,7 @@ BOOL CXmpp::AuthTag(TiXmlDocument* xmlDoc)`
`2804`	`2804`	`if(!e)`
`2805`	`2805`	`break;`
`2806`	`2806`	`ASN1_STRING *d = X509_NAME_ENTRY_get_data(e);`
`2807`		`- char commonName = (char)ASN1_STRING_data(d);`
	`2807`	`+ const char commonName = (const char)ASN1_STRING_get0_data(d);`
`2808`	`2808`	`if(strMailAddr == "")`
`2809`	`2809`	`{`
`2810`	`2810`	`if(m_is_srv2srv_conn)`