diff options
| author | Brent Cook <bcook@openbsd.org> | 2018-02-11 22:01:17 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2018-02-11 22:01:17 -0600 |
| commit | 47781e69e2946011ea7bd0723e98a2fedff88980 (patch) | |
| tree | 3d247c8274fce4e03d5f5a2f701209809b7a27a3 | |
| parent | c3201f234dd332f03cac9f90c56a8ccad03b8fb3 (diff) | |
| parent | f2953bc209d32d1fd8c79e31b826c76623898187 (diff) | |
| download | portable-47781e69e2946011ea7bd0723e98a2fedff88980.tar.gz portable-47781e69e2946011ea7bd0723e98a2fedff88980.tar.bz2 portable-47781e69e2946011ea7bd0723e98a2fedff88980.zip | |
Land #386, Add tls_keypair
| -rw-r--r-- | include/compat/sys/stat.h | 12 | ||||
| -rw-r--r-- | include/compat/sys/types.h | 1 | ||||
| -rw-r--r-- | tls/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tls/Makefile.am | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/include/compat/sys/stat.h b/include/compat/sys/stat.h index 629c7fe..b88da1d 100644 --- a/include/compat/sys/stat.h +++ b/include/compat/sys/stat.h | |||
| @@ -10,9 +10,18 @@ | |||
| 10 | #include_next <sys/stat.h> | 10 | #include_next <sys/stat.h> |
| 11 | 11 | ||
| 12 | /* for old MinGW */ | 12 | /* for old MinGW */ |
| 13 | #ifndef S_IRWXU | ||
| 14 | #define S_IRWXU 0 | ||
| 15 | #endif | ||
| 16 | #ifndef S_IRWXG | ||
| 17 | #define S_IRWXG 0 | ||
| 18 | #endif | ||
| 13 | #ifndef S_IRGRP | 19 | #ifndef S_IRGRP |
| 14 | #define S_IRGRP 0 | 20 | #define S_IRGRP 0 |
| 15 | #endif | 21 | #endif |
| 22 | #ifndef S_IRWXO | ||
| 23 | #define S_IRWXO 0 | ||
| 24 | #endif | ||
| 16 | #ifndef S_IROTH | 25 | #ifndef S_IROTH |
| 17 | #define S_IROTH 0 | 26 | #define S_IROTH 0 |
| 18 | #endif | 27 | #endif |
| @@ -65,12 +74,15 @@ | |||
| 65 | #endif | 74 | #endif |
| 66 | 75 | ||
| 67 | #if defined(_MSC_VER) | 76 | #if defined(_MSC_VER) |
| 77 | # define S_IRWXU 0 /* RWX user */ | ||
| 68 | # define S_IRUSR S_IREAD /* Read user */ | 78 | # define S_IRUSR S_IREAD /* Read user */ |
| 69 | # define S_IWUSR S_IWRITE /* Write user */ | 79 | # define S_IWUSR S_IWRITE /* Write user */ |
| 70 | # define S_IXUSR 0 /* Execute user */ | 80 | # define S_IXUSR 0 /* Execute user */ |
| 81 | # define S_IRWXG 0 /* RWX group */ | ||
| 71 | # define S_IRGRP 0 /* Read group */ | 82 | # define S_IRGRP 0 /* Read group */ |
| 72 | # define S_IWGRP 0 /* Write group */ | 83 | # define S_IWGRP 0 /* Write group */ |
| 73 | # define S_IXGRP 0 /* Execute group */ | 84 | # define S_IXGRP 0 /* Execute group */ |
| 85 | # define S_IRWXO 0 /* RWX others */ | ||
| 74 | # define S_IROTH 0 /* Read others */ | 86 | # define S_IROTH 0 /* Read others */ |
| 75 | # define S_IWOTH 0 /* Write others */ | 87 | # define S_IWOTH 0 /* Write others */ |
| 76 | # define S_IXOTH 0 /* Execute others */ | 88 | # define S_IXOTH 0 /* Execute others */ |
diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h index 701b77a..473d6da 100644 --- a/include/compat/sys/types.h +++ b/include/compat/sys/types.h | |||
| @@ -28,6 +28,7 @@ typedef unsigned char u_char; | |||
| 28 | typedef unsigned short u_short; | 28 | typedef unsigned short u_short; |
| 29 | typedef unsigned int u_int; | 29 | typedef unsigned int u_int; |
| 30 | typedef uint32_t in_addr_t; | 30 | typedef uint32_t in_addr_t; |
| 31 | typedef uint32_t mode_t; | ||
| 31 | 32 | ||
| 32 | #include <basetsd.h> | 33 | #include <basetsd.h> |
| 33 | typedef SSIZE_T ssize_t; | 34 | typedef SSIZE_T ssize_t; |
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index fbe6693..bc0c8f5 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
| @@ -11,6 +11,7 @@ set( | |||
| 11 | tls_client.c | 11 | tls_client.c |
| 12 | tls_config.c | 12 | tls_config.c |
| 13 | tls_conninfo.c | 13 | tls_conninfo.c |
| 14 | tls_keypair.c | ||
| 14 | tls_server.c | 15 | tls_server.c |
| 15 | tls_ocsp.c | 16 | tls_ocsp.c |
| 16 | tls_peer.c | 17 | tls_peer.c |
diff --git a/tls/Makefile.am b/tls/Makefile.am index bd2707a..bfe9571 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
| @@ -23,6 +23,7 @@ libtls_la_SOURCES += tls_client.c | |||
| 23 | libtls_la_SOURCES += tls_bio_cb.c | 23 | libtls_la_SOURCES += tls_bio_cb.c |
| 24 | libtls_la_SOURCES += tls_config.c | 24 | libtls_la_SOURCES += tls_config.c |
| 25 | libtls_la_SOURCES += tls_conninfo.c | 25 | libtls_la_SOURCES += tls_conninfo.c |
| 26 | libtls_la_SOURCES += tls_keypair.c | ||
| 26 | libtls_la_SOURCES += tls_server.c | 27 | libtls_la_SOURCES += tls_server.c |
| 27 | libtls_la_SOURCES += tls_ocsp.c | 28 | libtls_la_SOURCES += tls_ocsp.c |
| 28 | libtls_la_SOURCES += tls_peer.c | 29 | libtls_la_SOURCES += tls_peer.c |
