Merge pull request #98 from methane/static-sha2

9EOR9 · web-flow · commit 9f39c5c1a384 · 2019-02-03T09:25:50.000+01:00
Support static linking auth plugins
diff --git a/plugins/auth/caching_sha2_pw.c b/plugins/auth/caching_sha2_pw.c
@@ -194,7 +194,7 @@ static LPBYTE ma_load_pem(const char *buffer, DWORD *buffer_len)
 }
 #endif
 
-char *load_pub_key_file(const char *filename, int *pub_key_size)
+static char *load_pub_key_file(const char *filename, int *pub_key_size)
 {
   FILE *fp= NULL;
   char *buffer= NULL;
diff --git a/plugins/auth/sha256_pw.c b/plugins/auth/sha256_pw.c
@@ -112,7 +112,7 @@ static LPBYTE ma_load_pem(const char *buffer, DWORD *buffer_len)
 }
 #endif
 
-char *load_pub_key_file(const char *filename, int *pub_key_size)
+static char *load_pub_key_file(const char *filename, int *pub_key_size)
 {
   FILE *fp= NULL;
   char *buffer= NULL;

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ static LPBYTE ma_load_pem(const char buffer, DWORD buffer_len)`
`194`	`194`	`}`
`195`	`195`	`#endif`
`196`	`196`
`197`		`-char load_pub_key_file(const char filename, int *pub_key_size)`
	`197`	`+static char load_pub_key_file(const char filename, int *pub_key_size)`
`198`	`198`	`{`
`199`	`199`	`FILE *fp= NULL;`
`200`	`200`	`char *buffer= NULL;`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static LPBYTE ma_load_pem(const char buffer, DWORD buffer_len)`
`112`	`112`	`}`
`113`	`113`	`#endif`
`114`	`114`
`115`		`-char load_pub_key_file(const char filename, int *pub_key_size)`
	`115`	`+static char load_pub_key_file(const char filename, int *pub_key_size)`
`116`	`116`	`{`
`117`	`117`	`FILE *fp= NULL;`
`118`	`118`	`char *buffer= NULL;`