add cmake

7 files changed, 10 insertions, 92 deletions

diff --git a/src/SSL_Analyze.c b/src/SSL_Analyze.c
index 489eaea..138e742 100644
--- a/src/SSL_Analyze.c
+++ b/src/SSL_Analyze.c
@@ -15,7 +15,6 @@
 #include "SSL_Message.h"
 #include "ssl.h"
 #include "SSL_Proc.h"
-#include "SSL_Common.h"
 
 ssl_prog_runtime_parameter_t 	g_ssl_prog_para;
 
diff --git a/src/SSL_Certificate.c b/src/SSL_Certificate.c
index d6f8dba..9fb8d9f 100644
--- a/src/SSL_Certificate.c
+++ b/src/SSL_Certificate.c
@@ -241,8 +241,9 @@ UCHAR ssl_AnalyseCertificate(char *pcSslCertificateData, int iDataLen, ssl_strea
 	cert_chain_t cert_unit[CERT_MAXNUM];
 	int	cert_num = 0;
 	int cert_cnt = ssl_read_all_cert(pcCurSslCertificateData, iUnAnaCertLen, cert_unit, CERT_MAXNUM);
-    	
-	for(int i=0;i<cert_cnt;i++)
+
+	int i=0;
+	for(i=0;i<cert_cnt;i++)
 	{
 		return_val = fn_pGetSSLInfo(cert_unit[i].cert, cert_unit[i].cert_len, a_ssl_stream, a_tcp, region_flag, thread_seq, a_packet);
         if( SSL_RETURN_NORM != return_val)      return return_val; 
@@ -1110,7 +1111,8 @@ UCHAR  fn_pGetSSLInfo(char *pcCert, int iLen, ssl_stream *a_ssl_stream,  struct
 			a_ssl_stream->stSSLCert->SSLSubAltName->san_array = (san_t*)dictator_malloc(thread_seq, cnt*sizeof(san_t));
 			memset(a_ssl_stream->stSSLCert->SSLSubAltName->san_array,0,cnt*sizeof(san_t));
 			a_ssl_stream->stSSLCert->SSLSubAltName->count = 0;
-			for (int i = 0; i < cnt; i++)
+			int i=0;
+			for (i = 0; i < cnt; i++)
 			{       
 				generalName = sk_GENERAL_NAME_value(subjectAltNames, i);
 				if(!generalName) goto cert_return;
diff --git a/src/SSL_Common.c b/src/SSL_Common.c
deleted file mode 100644
index 0d9aea8..0000000
--- a/src/SSL_Common.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SSL_Common.c
-
- *
- *  Created on: 2013-5-8
- *      Author: lis
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SSL_Common.h"
-
-int get_so_path(void* func_addr,char* path,unsigned int size)
- 
- {
- 
-		  Dl_info av_dl_info;
- 
-		  dladdr(func_addr,&av_dl_info);
- 
-		  unsigned int i=0,last_slash_pos=0;
- 
-		  for(i=0;i<strlen(av_dl_info.dli_fname);i++)
- 
-		  {
- 
-					if(av_dl_info.dli_fname[i]=='/')
- 
-					{
- 
-							 last_slash_pos=i;
- 
-					}
- 
-		  }
- 
-		  if(i<size)
- 
-		  {
- 
-					memcpy(path,av_dl_info.dli_fname,last_slash_pos);
- 
-					return last_slash_pos;
- 
-		  }
- 
-		  else
- 
-		  {
- 
-					return 0;
- 
-		  }
- 
-  
- 
- }
- 
-
diff --git a/src/SSL_Common.h b/src/SSL_Common.h
deleted file mode 100644
index 1a9bf93..0000000
--- a/src/SSL_Common.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SSL_Common.h
-
- *
- *  Created on: 2013-5-8
- *      Author: lis
- */
-
-#ifndef SSL_COMMON_H_
-#define SSL_COMMON_H_
-
-#include <time.h>
-#include <ctype.h>
-#include <dlfcn.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-int get_so_path(void* func_addr,char* path,unsigned int size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* SSL_COMMON_H_ */
diff --git a/src/SSL_Message.c b/src/SSL_Message.c
index dd16db1..e2f7a3e 100644
--- a/src/SSL_Message.c
+++ b/src/SSL_Message.c
@@ -3,7 +3,6 @@
 #include "ssl.h"
 #include "SSL_Message.h"
 #include "SSL_Proc.h"
-#include "SSL_Common.h"
 #include "SSL_Certificate.h"
 
 extern ssl_prog_runtime_parameter_t 	g_ssl_prog_para;
diff --git a/src/SSL_Proc.c b/src/SSL_Proc.c
index 975be6a..f42b59a 100644
--- a/src/SSL_Proc.c
+++ b/src/SSL_Proc.c
@@ -13,7 +13,6 @@
 #include "SSL_Message.h"
 #include "ssl.h"
 #include "SSL_Proc.h"
-#include "SSL_Common.h"
 
 //debug
 #define PRINTF_CLIENT_HELLO		0
@@ -77,7 +76,8 @@ UCHAR ssl_doWithVersion(ssl_stream **a_ssl_stream, struct streaminfo *a_tcp,
 	if(!(g_ssl_prog_para.ssl_interested_region_flag&SSL_VERSION))	return return_val;
 	
 	int find_index = -1;
-	for(unsigned int i=0;pastSslVersions[i].uiValue!=0;i++)
+	unsigned int i=0;
+	for(i=0;pastSslVersions[i].uiValue!=0;i++)
 	{
 		if(pastSslVersions[i].uiValue==(*a_ssl_stream)->uiSslVersion)
 		{
diff --git a/src/ssl_update.txt b/src/ssl_update.txt
index 8e23e04..267c59a 100644
--- a/src/ssl_update.txt
+++ b/src/ssl_update.txt
@@ -9,7 +9,9 @@ https://blog.csdn.net/aixiaoxiaoyu/article/details/79175855
 https://www.cnblogs.com/huhu0013/p/4791430.html
 BIO
 https://blog.csdn.net/liujiayu2/article/details/51860172
-
+*************************************************
+2019.7.4
+1.����cmake
 *************************************************
 2019.1.28
 1.�޸�֤�������bug