f6294c4 Isolate more openssl headers — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Isolate more openssl headers

Baptiste Daroussin committed 9 years ago

commit f6294c436bdaef2ced7e38cab9008e5de2b66880
parent c05dc99

17 files changed +22 -9

modified libpkg/pkg.h.in

@@ -42,8 +42,8 @@ extern "C" {

 #include <sys/cdefs.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/sbuf.h>
 #include <openssl/pem.h>
 #include <sysexits.h>
 /* The expected name of the pkg(8) binary executable. */

modified libpkg/pkg_checksum.c

@@ -31,6 +31,7 @@

 #include "pkg.h"
 #include "private/pkg.h"
 #include "private/event.h"
 #include <openssl/sha.h>
 #include "blake2.h"
 struct pkg_checksum_entry {

modified libpkg/pkg_deps.c

@@ -32,6 +32,7 @@

 #include <ctype.h>
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include "pkg.h"
 #include "private/event.h"

modified libpkg/pkg_manifest.c

@@ -37,6 +37,7 @@

 #include <stdlib.h>
 #include <string.h>
 #include <ucl.h>
 #include <openssl/sha.h>
 #include "pkg.h"
 #include "private/event.h"

modified libpkg/pkg_repo_create.c

@@ -988,7 +988,7 @@ out:

 }
 int
 pkg_finish_repo(const char *output_dir, pem_password_cb *password_cb,
 pkg_finish_repo(const char *output_dir, pkg_password_cb *password_cb,
     char **argv, int argc, bool filelist)
 {
 	char repo_path[MAXPATHLEN];

modified libpkg/private/utils.h

@@ -37,8 +37,6 @@

 #include <khash.h>
 #include <pkg.h>
 #include <openssl/rsa.h>
 #define STARTS_WITH(string, needle) (strncasecmp(string, needle, strlen(needle)) == 0)
 #define RELATIVE_PATH(p) (p + (*p == '/' ? 1 : 0))

@@ -62,11 +60,7 @@ struct dns_srvinfo {

 	struct dns_srvinfo *next;
 };
 struct rsa_key {
 	pkg_password_cb *pw_cb;
 	char *path;
 	RSA *key;
 };
 struct rsa_key;
 int32_t string_hash_func(const char *);
 void sbuf_init(struct sbuf **);

modified libpkg/rsa.c

@@ -39,6 +39,12 @@

 #include "private/event.h"
 #include "private/pkg.h"
 struct rsa_key {
 	pkg_password_cb *pw_cb;
 	char *path;
 	RSA *key;
 };
 static int
 _load_rsa_private_key(struct rsa_key *rsa)
 {

modified libpkg/ssh.c

@@ -36,6 +36,7 @@

 #include <sys/stat.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>

modified src/add.c

@@ -32,6 +32,7 @@

 #include <errno.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>

modified src/annotate.c

@@ -34,6 +34,7 @@

 #include <err.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>

modified src/check.c

@@ -37,6 +37,7 @@

 #include <sysexits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <utlist.h>

modified src/create.c

@@ -43,6 +43,7 @@

 #include <err.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pkg.h>
 #include <string.h>
 #include <unistd.h>

modified src/lock.c

@@ -28,6 +28,7 @@

 #include <err.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sysexits.h>
 #include <unistd.h>

modified src/search.c

@@ -31,6 +31,7 @@

 #include <err.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sysexits.h>

modified src/set.c

@@ -30,6 +30,7 @@

 #include <getopt.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>

modified src/updating.c

@@ -40,6 +40,7 @@

 #include <getopt.h>
 #include <pkg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>

modified src/utils.c

@@ -46,6 +46,7 @@

 #include <stdarg.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <pkg.h>