Removing openssl dependency. Using Crypt instead.

perezale · scanoss-qg · May 24, 2022 · Mar 14, 2022 · Mar 25, 2022 · Mar 28, 2022
commit cf164a2a70540cc662ceda01c19b8eb6c54bdd8c
diff --git a/src/scanoss/agent/Makefile b/src/scanoss/agent/Makefile
@@ -23,7 +23,7 @@ include $(VARS)
 
 CFLAGS_LOCAL = $(FO_CFLAGS) 
 LDFLAGS_LOCAL = $(FO_LDFLAGS) -lpq 
-LDFLAGS+=-lpthread -lcrypto -lssl -lcurl -lm
+LDFLAGS+=-lpthread  -lcurl -lm -lgcrypt
 CCFLAGS+= -fPIC -g -Wall  -std=gnu99 -I./inc -I./external/inc
 
 SOURCES_SCANNER=$(wildcard src/*.c) $(wildcard src/**/*.c)  $(wildcard external/*.c) $(wildcard external/**/*.c)

diff --git a/src/scanoss/agent/main.c b/src/scanoss/agent/main.c
@@ -51,8 +51,6 @@ void logme(char *msg)
 }
 void loadAgentConfiguration(PGconn *pg_conn)
 {
-
-  char sqlbuf[200];
   PGresult *result;
   char sqlA[] = "select conf_value from sysconfig where variablename='ScAPIURL';";
 
@@ -84,11 +82,6 @@ void loadAgentConfiguration(PGconn *pg_conn)
   }
   sprintf(ApiPort, "%s", PQgetvalue(result, 0, 0));
 
-
-
-
-
-
 }
 
 
@@ -113,24 +106,24 @@ int createTables(PGconn* pgConn)
 
     result = PQexec(pgConn, sql);
     if (fo_checkPQcommand(pgConn, result, sql, __FILE__, __LINE__)) {
-     
+
     // Can 't create table scanoss_fileinfo
   }
   }
-char sqlPort[]="INSERT INTO sysconfig (variablename, conf_value, ui_label, vartype, group_name, group_order, description, validation_function, option_value)\
+  char sqlPort[]="INSERT INTO sysconfig (variablename, conf_value, ui_label, vartype, group_name, group_order, description, validation_function, option_value)\
   VALUES('ScPort', '443', 'SCANOSS port', 2, 'SCANOSS', 3, 'Host port for the API (defult 443)', NULL, NULL);";
 
-char sqlHost[]="INSERT INTO sysconfig (variablename, conf_value, ui_label, vartype, group_name, group_order, description, validation_function, option_value) \
+  char sqlHost[]="INSERT INTO sysconfig (variablename, conf_value, ui_label, vartype, group_name, group_order, description, validation_function, option_value) \
   VALUES('ScAPIURL', 'https://scanoss.com/api', 'SCANOSS API URL', 2, 'SCANOSS', 1, '(leave blank for default https://osskb.org/scan/direct)', NULL, NULL);";
-char sqlToken[]="INSERT INTO sysconfig (sysconfig_pk, variablename, conf_value, ui_label, vartype, group_name, group_order, description, validation_function, option_value) \
-  VALUES(73, 'ScToken', 'fD4P8wbfWS9XHvsrzcDrB0zu', 'SCANOSS access token', 2, 'SCANOSS', 2, 'Set token to access full scanning service.', NULL, NULL);";
- result = PQexec(pgConn, sqlPort);
-    if (fo_checkPQcommand(pgConn, result, sqlPort, __FILE__, __LINE__)) {
+  char sqlToken[]="INSERT INTO sysconfig ( variablename, conf_value, ui_label, vartype, group_name, group_order, description, validation_function, option_value) \
+  VALUES( 'ScToken', 'fD4P8wbfWS9XHvsrzcDrB0zu', 'SCANOSS access token', 2, 'SCANOSS', 2, 'Set token to access full scanning service.', NULL, NULL);";
+  result = PQexec(pgConn, sqlPort);
+  if (fo_checkPQcommand(pgConn, result, sqlPort, __FILE__, __LINE__)) {
 
     // Can 't create table scanoss_fileinfo
   }
   result = PQexec(pgConn, sqlHost);
-    if (fo_checkPQcommand(pgConn, result, sqlHost, __FILE__, __LINE__)) {
+   if (fo_checkPQcommand(pgConn, result, sqlHost, __FILE__, __LINE__)) {
 
     // Can 't create table scanoss_fileinfo
   }

diff --git a/src/scanoss/agent/snippet_scan.c b/src/scanoss/agent/snippet_scan.c
@@ -153,8 +153,6 @@ void scanTempFile(long key)
     char auxSql[5000];
 
 
-
-
     int licCount = runScan(aux, detectedLicenses,purl,url,matchType,oss_lines,filePath);    /* Scan for licenses on the temp file */
     if(strcmp(matchType,"none") && (!(strcmp(matchType,"file"))||!(strcmp(matchType,"snippet")) )){  
             sprintf(auxSql,"INSERT INTO scanoss_fileinfo (pfile_fk, matchtype, lineranges, purl, url, filepath) VALUES(%d, '%s', '%s', '%s', '%s', '%s');", key,matchType,oss_lines,purl,url,filePath);

diff --git a/src/scanoss/agent/src/scanner.c b/src/scanoss/agent/src/scanner.c
@@ -23,8 +23,7 @@
 
 #define _GNU_SOURCE
 #include <ctype.h>
-#include <openssl/md5.h>
-#include <openssl/ssl.h>
+#include <gcrypt.h>
 #include <dirent.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -64,6 +63,16 @@ const char EXCLUDED_EXTENSIONS[] = " .1, .2, .3, .4, .5, .6, .7, .8, .9, .ac, .a
 
 
 static int curl_request(int api_req, char* endpoint, char* data,scanner_object_t *s);
+/* Adapter function for compatibility with openssl*/
+void MD5(unsigned char *fileContent,int len,unsigned char output[16] ){
+  unsigned int l = gcry_md_get_algo_dlen(GCRY_MD_MD5); /* get digest length (used later to print the result) */
+ unsigned char *x;
+    gcry_md_hd_t h;
+    gcry_md_open(&h, GCRY_MD_MD5, GCRY_MD_FLAG_SECURE); /* initialise the hash context */
+    gcry_md_write(h, fileContent,len); /* hash some text */
+    x = gcry_md_read(h, GCRY_MD_MD5); /* get the result */
+    memcpy(output,x,16);
+}
 
 /* Returns a hexadecimal representation of the first "len" bytes in "bin" */
 static char *bin_to_hex(uint8_t *bin, uint32_t len)