bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 2 | /*
 | |
| 261
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Fix name in header. | 3 |  * Mandos-client - get and decrypt data from a Mandos server
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 4 |  *
 | 
| 5 |  * This program is partly derived from an example program for an Avahi
 | |
| 6 |  * service browser, downloaded from
 | |
| 7 |  * <http://avahi.org/browser/examples/core-browse-services.c>.  This
 | |
| 8 |  * includes the following functions: "resolve_callback",
 | |
| 9 |  * "browse_callback", and parts of "main".
 | |
| 10 |  * 
 | |
| 28
by Teddy Hogeborn * server.conf: New file. | 11 |  * Everything else is
 | 
| 246
by Teddy Hogeborn * README: Update copyright year; add "2009". | 12 |  * Copyright © 2008,2009 Teddy Hogeborn
 | 
| 13 |  * Copyright © 2008,2009 Björn Påhlsson
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 14 |  * 
 | 
| 15 |  * This program is free software: you can redistribute it and/or
 | |
| 16 |  * modify it under the terms of the GNU General Public License as
 | |
| 17 |  * published by the Free Software Foundation, either version 3 of the
 | |
| 18 |  * License, or (at your option) any later version.
 | |
| 19 |  * 
 | |
| 20 |  * This program is distributed in the hope that it will be useful, but
 | |
| 21 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| 22 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 23 |  * General Public License for more details.
 | |
| 24 |  * 
 | |
| 25 |  * You should have received a copy of the GNU General Public License
 | |
| 26 |  * along with this program.  If not, see
 | |
| 27 |  * <http://www.gnu.org/licenses/>.
 | |
| 28 |  * 
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 29 |  * Contact the authors at <mandos@fukt.bsnet.se>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 30 |  */
 | 
| 31 | ||
| 28
by Teddy Hogeborn * server.conf: New file. | 32 | /* Needed by GPGME, specifically gpgme_data_seek() */
 | 
| 13
by Björn Påhlsson Added following support: | 33 | #define _LARGEFILE_SOURCE
 | 
| 34 | #define _FILE_OFFSET_BITS 64
 | |
| 35 | ||
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 36 | #define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */ | 
| 24.1.10
by Björn Påhlsson merge commit | 37 | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 38 | #include <stdio.h> /* fprintf(), stderr, fwrite(), | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 39 | stdout, ferror(), remove() */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 40 | #include <stdint.h> /* uint16_t, uint32_t */ | 
| 41 | #include <stddef.h> /* NULL, size_t, ssize_t */ | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 42 | #include <stdlib.h> /* free(), EXIT_SUCCESS, EXIT_FAILURE, | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 43 | srand(), strtof() */ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 44 | #include <stdbool.h> /* bool, false, true */ | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 45 | #include <string.h> /* memset(), strcmp(), strlen(), | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 46 | strerror(), asprintf(), strcpy() */ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 47 | #include <sys/ioctl.h> /* ioctl */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 48 | #include <sys/types.h> /* socket(), inet_pton(), sockaddr, | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 49 | sockaddr_in6, PF_INET6, | 
| 304
by Teddy Hogeborn Four new interrelated features: | 50 | SOCK_STREAM, uid_t, gid_t, open(), | 
| 51 | opendir(), DIR */ | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 52 | #include <sys/stat.h> /* open() */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 53 | #include <sys/socket.h> /* socket(), struct sockaddr_in6, | 
| 304
by Teddy Hogeborn Four new interrelated features: | 54 | inet_pton(), connect() */ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 55 | #include <fcntl.h> /* open() */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 56 | #include <dirent.h> /* opendir(), struct dirent, readdir() | 
| 57 | */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 58 | #include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t, | 
| 59 | strtoimax() */ | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 60 | #include <assert.h> /* assert() */ | 
| 61 | #include <errno.h> /* perror(), errno */ | |
| 291
by Teddy Hogeborn Merge from Björn: | 62 | #include <time.h> /* nanosleep(), time() */ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 63 | #include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP, | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 64 | SIOCSIFFLAGS, if_indextoname(), | 
| 65 | if_nametoindex(), IF_NAMESIZE */ | |
| 304
by Teddy Hogeborn Four new interrelated features: | 66 | #include <netinet/in.h> /* IN6_IS_ADDR_LINKLOCAL, | 
| 67 | INET_ADDRSTRLEN, INET6_ADDRSTRLEN | |
| 68 | */ | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 69 | #include <unistd.h> /* close(), SEEK_SET, off_t, write(), | 
| 70 | getuid(), getgid(), setuid(), | |
| 71 | setgid() */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 72 | #include <arpa/inet.h> /* inet_pton(), htons */ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 73 | #include <iso646.h> /* not, or, and */ | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 74 | #include <argp.h> /* struct argp_option, error_t, struct | 
| 75 | argp_state, struct argp, | |
| 76 | argp_parse(), ARGP_KEY_ARG, | |
| 77 | ARGP_KEY_END, ARGP_ERR_UNKNOWN */ | |
| 307
by Teddy Hogeborn Merge from Björn: | 78 | #include <signal.h> /* sigemptyset(), sigaddset(), | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 79 | sigaction(), SIGTERM, sigaction, | 
| 80 | sig_atomic_t */ | |
| 307
by Teddy Hogeborn Merge from Björn: | 81 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 82 | #ifdef __linux__
 | 
| 24.1.124
by Björn Påhlsson Added lower kernel loglevel to reduce clutter on system console. | 83 | #include <sys/klog.h> /* klogctl() */ | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 84 | #endif /* __linux__ */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 85 | |
| 86 | /* Avahi */
 | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 87 | /* All Avahi types, constants and functions
 | 
| 88 |  Avahi*, avahi_*,
 | |
| 89 |  AVAHI_* */
 | |
| 90 | #include <avahi-core/core.h> | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 91 | #include <avahi-core/lookup.h> | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 92 | #include <avahi-core/log.h> | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 93 | #include <avahi-common/simple-watch.h> | 
| 94 | #include <avahi-common/malloc.h> | |
| 95 | #include <avahi-common/error.h> | |
| 96 | ||
| 97 | /* GnuTLS */
 | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 98 | #include <gnutls/gnutls.h> /* All GnuTLS types, constants and | 
| 99 | functions: | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 100 | gnutls_* | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 101 | init_gnutls_session(), | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 102 | GNUTLS_* */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 103 | #include <gnutls/openpgp.h> | 
| 104 | /* gnutls_certificate_set_openpgp_key_file(), | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 105 | 				   GNUTLS_OPENPGP_FMT_BASE64 */
 | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 106 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 107 | /* GPGME */
 | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 108 | #include <gpgme.h> /* All GPGME types, constants and | 
| 109 | functions: | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 110 | gpgme_* | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 111 | GPGME_PROTOCOL_OpenPGP, | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 112 | GPG_ERR_NO_* */ | 
| 13
by Björn Påhlsson Added following support: | 113 | |
| 114 | #define BUFFER_SIZE 256
 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 115 | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 116 | #define PATHDIR "/conf/conf.d/mandos"
 | 
| 117 | #define SECKEY "seckey.txt"
 | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 118 | #define PUBKEY "pubkey.txt"
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 119 | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 120 | bool debug = false; | 
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 121 | static const char mandos_protocol_version[] = "1"; | 
| 217
by Teddy Hogeborn * .bzrignore: Added "man" directory (created by "make install-html"). | 122 | const char *argp_program_version = "mandos-client " VERSION; | 
| 24.1.14
by Björn Påhlsson mandosclient | 123 | const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>"; | 
| 24.1.10
by Björn Påhlsson merge commit | 124 | |
| 42
by Teddy Hogeborn * plugins.d/mandosclient.c (start_mandos_communication): Change "to" | 125 | /* Used for passing in values through the Avahi callback functions */
 | 
| 13
by Björn Påhlsson Added following support: | 126 | typedef struct { | 
| 24.1.9
by Björn Påhlsson not working midwork... | 127 | AvahiSimplePoll *simple_poll; | 
| 128 | AvahiServer *server; | |
| 13
by Björn Påhlsson Added following support: | 129 | gnutls_certificate_credentials_t cred; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 130 | unsigned int dh_bits; | 
| 24.1.13
by Björn Påhlsson mandosclient | 131 | gnutls_dh_params_t dh_params; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 132 | const char *priority; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 133 | gpgme_ctx_t ctx; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 134 | } mandos_context; | 
| 13
by Björn Påhlsson Added following support: | 135 | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 136 | /* global context so signal handler can reach it*/
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 137 | mandos_context mc = { .simple_poll = NULL, .server = NULL, | 
| 138 | .dh_bits = 1024, .priority = "SECURE256" | |
| 139 | ":!CTYPE-X.509:+CTYPE-OPENPGP" }; | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 140 | |
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 141 | /*
 | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 142 |  * Make additional room in "buffer" for at least BUFFER_SIZE more
 | 
| 143 |  * bytes. "buffer_capacity" is how much is currently allocated,
 | |
| 144 |  * "buffer_length" is how much is already used.
 | |
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 145 |  */
 | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 146 | size_t incbuffer(char **buffer, size_t buffer_length, | 
| 24.1.10
by Björn Påhlsson merge commit | 147 | size_t buffer_capacity){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 148 | if(buffer_length + BUFFER_SIZE > buffer_capacity){ | 
| 24.1.12
by Björn Påhlsson merge + | 149 | *buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 150 | if(buffer == NULL){ | 
| 24.1.10
by Björn Påhlsson merge commit | 151 | return 0; | 
| 152 | } | |
| 153 | buffer_capacity += BUFFER_SIZE; | |
| 154 | } | |
| 155 | return buffer_capacity; | |
| 156 | }
 | |
| 157 | ||
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 158 | /* 
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 159 |  * Initialize GPGME.
 | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 160 |  */
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 161 | static bool init_gpgme(const char *seckey, | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 162 | const char *pubkey, const char *tempdir){ | 
| 163 | int ret; | |
| 13
by Björn Påhlsson Added following support: | 164 | gpgme_error_t rc; | 
| 165 | gpgme_engine_info_t engine_info; | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 166 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 167 |   
 | 
| 168 | /* | |
| 288
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Use separate bool variable instead | 169 |    * Helper function to insert pub and seckey to the engine keyring.
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 170 |    */
 | 
| 171 | bool import_key(const char *filename){ | |
| 172 | int fd; | |
| 173 | gpgme_data_t pgp_data; | |
| 174 |     
 | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 175 | fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 176 | if(fd == -1){ | 
| 177 | perror("open"); | |
| 178 | return false; | |
| 179 | } | |
| 180 |     
 | |
| 181 | rc = gpgme_data_new_from_fd(&pgp_data, fd); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 182 | if(rc != GPG_ERR_NO_ERROR){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 183 | fprintf(stderr, "bad gpgme_data_new_from_fd: %s: %s\n", | 
| 184 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 185 | return false; | |
| 186 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 187 |     
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 188 | rc = gpgme_op_import(mc.ctx, pgp_data); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 189 | if(rc != GPG_ERR_NO_ERROR){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 190 | fprintf(stderr, "bad gpgme_op_import: %s: %s\n", | 
| 191 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 192 | return false; | |
| 193 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 194 |     
 | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 195 | ret = (int)TEMP_FAILURE_RETRY(close(fd)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 196 | if(ret == -1){ | 
| 197 | perror("close"); | |
| 198 | } | |
| 199 | gpgme_data_release(pgp_data); | |
| 200 | return true; | |
| 201 | } | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 202 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 203 | if(debug){ | 
| 307
by Teddy Hogeborn Merge from Björn: | 204 | fprintf(stderr, "Initializing GPGME\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 205 | } | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 206 |   
 | 
| 13
by Björn Påhlsson Added following support: | 207 | /* Init GPGME */ | 
| 208 | gpgme_check_version(NULL); | |
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 209 | rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 210 | if(rc != GPG_ERR_NO_ERROR){ | 
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 211 | fprintf(stderr, "bad gpgme_engine_check_version: %s: %s\n", | 
| 212 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 213 | return false; | 
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 214 | } | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 215 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 216 | /* Set GPGME home directory for the OpenPGP engine only */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 217 | rc = gpgme_get_engine_info(&engine_info); | 
| 218 | if(rc != GPG_ERR_NO_ERROR){ | |
| 13
by Björn Påhlsson Added following support: | 219 | fprintf(stderr, "bad gpgme_get_engine_info: %s: %s\n", | 
| 220 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 221 | return false; | 
| 13
by Björn Påhlsson Added following support: | 222 | } | 
| 223 | while(engine_info != NULL){ | |
| 224 | if(engine_info->protocol == GPGME_PROTOCOL_OpenPGP){ | |
| 225 | gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 226 | engine_info->file_name, tempdir); | 
| 13
by Björn Påhlsson Added following support: | 227 | break; | 
| 228 | } | |
| 229 | engine_info = engine_info->next; | |
| 230 | } | |
| 231 | if(engine_info == NULL){ | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 232 | fprintf(stderr, "Could not set GPGME home dir to %s\n", tempdir); | 
| 233 | return false; | |
| 234 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 235 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 236 | /* Create new GPGME "context" */ | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 237 | rc = gpgme_new(&(mc.ctx)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 238 | if(rc != GPG_ERR_NO_ERROR){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 239 | fprintf(stderr, "bad gpgme_new: %s: %s\n", | 
| 240 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 241 | return false; | |
| 242 | } | |
| 243 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 244 | if(not import_key(pubkey) or not import_key(seckey)){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 245 | return false; | 
| 246 | } | |
| 247 |   
 | |
| 248 | return true; | |
| 249 | }
 | |
| 250 | ||
| 251 | /* 
 | |
| 252 |  * Decrypt OpenPGP data.
 | |
| 253 |  * Returns -1 on error
 | |
| 254 |  */
 | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 255 | static ssize_t pgp_packet_decrypt(const char *cryptotext, | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 256 | size_t crypto_size, | 
| 257 | char **plaintext){ | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 258 | gpgme_data_t dh_crypto, dh_plain; | 
| 259 | gpgme_error_t rc; | |
| 260 | ssize_t ret; | |
| 261 | size_t plaintext_capacity = 0; | |
| 262 | ssize_t plaintext_length = 0; | |
| 263 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 264 | if(debug){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 265 | fprintf(stderr, "Trying to decrypt OpenPGP data\n"); | 
| 13
by Björn Påhlsson Added following support: | 266 | } | 
| 267 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 268 | /* Create new GPGME data buffer from memory cryptotext */ | 
| 269 | rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size, | |
| 270 | 0); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 271 | if(rc != GPG_ERR_NO_ERROR){ | 
| 13
by Björn Påhlsson Added following support: | 272 | fprintf(stderr, "bad gpgme_data_new_from_mem: %s: %s\n", | 
| 273 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 274 | return -1; | |
| 275 | } | |
| 276 |   
 | |
| 277 | /* Create new empty GPGME data buffer for the plaintext */ | |
| 278 | rc = gpgme_data_new(&dh_plain); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 279 | if(rc != GPG_ERR_NO_ERROR){ | 
| 13
by Björn Påhlsson Added following support: | 280 | fprintf(stderr, "bad gpgme_data_new: %s: %s\n", | 
| 281 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 282 | gpgme_data_release(dh_crypto); | 
| 13
by Björn Påhlsson Added following support: | 283 | return -1; | 
| 284 | } | |
| 285 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 286 | /* Decrypt data from the cryptotext data buffer to the plaintext | 
| 287 |      data buffer */
 | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 288 | rc = gpgme_op_decrypt(mc.ctx, dh_crypto, dh_plain); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 289 | if(rc != GPG_ERR_NO_ERROR){ | 
| 13
by Björn Påhlsson Added following support: | 290 | fprintf(stderr, "bad gpgme_op_decrypt: %s: %s\n", | 
| 291 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 292 | plaintext_length = -1; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 293 | if(debug){ | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 294 | gpgme_decrypt_result_t result; | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 295 | result = gpgme_op_decrypt_result(mc.ctx); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 296 | if(result == NULL){ | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 297 | fprintf(stderr, "gpgme_op_decrypt_result failed\n"); | 
| 298 | } else { | |
| 299 | fprintf(stderr, "Unsupported algorithm: %s\n", | |
| 300 | result->unsupported_algorithm); | |
| 301 | fprintf(stderr, "Wrong key usage: %u\n", | |
| 302 | result->wrong_key_usage); | |
| 303 | if(result->file_name != NULL){ | |
| 304 | fprintf(stderr, "File name: %s\n", result->file_name); | |
| 305 | } | |
| 306 | gpgme_recipient_t recipient; | |
| 307 | recipient = result->recipients; | |
| 308 | if(recipient){ | |
| 309 | while(recipient != NULL){ | |
| 310 | fprintf(stderr, "Public key algorithm: %s\n", | |
| 311 | gpgme_pubkey_algo_name(recipient->pubkey_algo)); | |
| 312 | fprintf(stderr, "Key ID: %s\n", recipient->keyid); | |
| 313 | fprintf(stderr, "Secret key available: %s\n", | |
| 314 | recipient->status == GPG_ERR_NO_SECKEY | |
| 315 | ? "No" : "Yes"); | |
| 316 | recipient = recipient->next; | |
| 317 | } | |
| 318 | } | |
| 319 | } | |
| 320 | } | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 321 | goto decrypt_end; | 
| 13
by Björn Påhlsson Added following support: | 322 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 323 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 324 | if(debug){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 325 | fprintf(stderr, "Decryption of OpenPGP data succeeded\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 326 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 327 |   
 | 
| 13
by Björn Påhlsson Added following support: | 328 | /* Seek back to the beginning of the GPGME plaintext data buffer */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 329 | if(gpgme_data_seek(dh_plain, (off_t)0, SEEK_SET) == -1){ | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 330 | perror("gpgme_data_seek"); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 331 | plaintext_length = -1; | 
| 332 | goto decrypt_end; | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 333 | } | 
| 334 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 335 | *plaintext = NULL; | 
| 13
by Björn Påhlsson Added following support: | 336 | while(true){ | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 337 | plaintext_capacity = incbuffer(plaintext, | 
| 42
by Teddy Hogeborn * plugins.d/mandosclient.c (start_mandos_communication): Change "to" | 338 | (size_t)plaintext_length, | 
| 24.1.12
by Björn Påhlsson merge + | 339 | plaintext_capacity); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 340 | if(plaintext_capacity == 0){ | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 341 | perror("incbuffer"); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 342 | plaintext_length = -1; | 
| 343 | goto decrypt_end; | |
| 13
by Björn Påhlsson Added following support: | 344 | } | 
| 345 |     
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 346 | ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length, | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 347 | BUFFER_SIZE); | 
| 13
by Björn Påhlsson Added following support: | 348 | /* Print the data, if any */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 349 | if(ret == 0){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 350 | /* EOF */ | 
| 13
by Björn Påhlsson Added following support: | 351 | break; | 
| 352 | } | |
| 353 | if(ret < 0){ | |
| 354 | perror("gpgme_data_read"); | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 355 | plaintext_length = -1; | 
| 356 | goto decrypt_end; | |
| 13
by Björn Påhlsson Added following support: | 357 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 358 | plaintext_length += ret; | 
| 13
by Björn Påhlsson Added following support: | 359 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 360 |   
 | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 361 | if(debug){ | 
| 362 | fprintf(stderr, "Decrypted password is: "); | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 363 | for(ssize_t i = 0; i < plaintext_length; i++){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 364 | fprintf(stderr, "%02hhX ", (*plaintext)[i]); | 
| 365 | } | |
| 366 | fprintf(stderr, "\n"); | |
| 367 | } | |
| 368 |   
 | |
| 369 | decrypt_end: | |
| 370 |   
 | |
| 371 | /* Delete the GPGME cryptotext data buffer */ | |
| 372 | gpgme_data_release(dh_crypto); | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 373 |   
 | 
| 374 | /* Delete the GPGME plaintext data buffer */ | |
| 13
by Björn Påhlsson Added following support: | 375 | gpgme_data_release(dh_plain); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 376 | return plaintext_length; | 
| 13
by Björn Påhlsson Added following support: | 377 | }
 | 
| 378 | ||
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 379 | static const char * safer_gnutls_strerror(int value){ | 
| 267
by Teddy Hogeborn * plugins.d/mandos-client.c: Only comment changes. | 380 | const char *ret = gnutls_strerror(value); /* Spurious warning from | 
| 381 | 					       -Wunreachable-code */
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 382 | if(ret == NULL) | 
| 13
by Björn Påhlsson Added following support: | 383 | ret = "(unknown)"; | 
| 384 | return ret; | |
| 385 | }
 | |
| 386 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 387 | /* GnuTLS log function callback */
 | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 388 | static void debuggnutls(__attribute__((unused)) int level, | 
| 389 | const char* string){ | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 390 | fprintf(stderr, "GnuTLS: %s", string); | 
| 13
by Björn Påhlsson Added following support: | 391 | }
 | 
| 392 | ||
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 393 | static int init_gnutls_global(const char *pubkeyfilename, | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 394 | const char *seckeyfilename){ | 
| 13
by Björn Påhlsson Added following support: | 395 | int ret; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 396 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 397 | if(debug){ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 398 | fprintf(stderr, "Initializing GnuTLS\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 399 | } | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 400 |   
 | 
| 401 | ret = gnutls_global_init(); | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 402 | if(ret != GNUTLS_E_SUCCESS){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 403 | fprintf(stderr, "GnuTLS global_init: %s\n", | 
| 404 | safer_gnutls_strerror(ret)); | |
| 13
by Björn Påhlsson Added following support: | 405 | return -1; | 
| 406 | } | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 407 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 408 | if(debug){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 409 | /* "Use a log level over 10 to enable all debugging options." | 
| 410 |      * - GnuTLS manual
 | |
| 411 |      */
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 412 | gnutls_global_set_log_level(11); | 
| 413 | gnutls_global_set_log_function(debuggnutls); | |
| 414 | } | |
| 415 |   
 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 416 | /* OpenPGP credentials */ | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 417 | gnutls_certificate_allocate_credentials(&mc.cred); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 418 | if(ret != GNUTLS_E_SUCCESS){ | 
| 267
by Teddy Hogeborn * plugins.d/mandos-client.c: Only comment changes. | 419 | fprintf(stderr, "GnuTLS memory error: %s\n", /* Spurious warning | 
| 304
by Teddy Hogeborn Four new interrelated features: | 420 | 						    from
 | 
| 421 | 						    -Wunreachable-code
 | |
| 422 | 						 */
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 423 | safer_gnutls_strerror(ret)); | 
| 424 | gnutls_global_deinit(); | |
| 13
by Björn Påhlsson Added following support: | 425 | return -1; | 
| 426 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 427 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 428 | if(debug){ | 
| 147
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Improved wording | 429 | fprintf(stderr, "Attempting to use OpenPGP public key %s and" | 
| 430 | " secret key %s as GnuTLS credentials\n", pubkeyfilename, | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 431 | seckeyfilename); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 432 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 433 |   
 | 
| 13
by Björn Påhlsson Added following support: | 434 | ret = gnutls_certificate_set_openpgp_key_file | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 435 | (mc.cred, pubkeyfilename, seckeyfilename, | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 436 | GNUTLS_OPENPGP_FMT_BASE64); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 437 | if(ret != GNUTLS_E_SUCCESS){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 438 | fprintf(stderr, | 
| 439 | "Error[%d] while reading the OpenPGP key pair ('%s'," | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 440 | " '%s')\n", ret, pubkeyfilename, seckeyfilename); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 441 | fprintf(stderr, "The GnuTLS error is: %s\n", | 
| 13
by Björn Påhlsson Added following support: | 442 | safer_gnutls_strerror(ret)); | 
| 24.1.20
by Björn Påhlsson mandosclient | 443 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 444 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 445 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 446 | /* GnuTLS server initialization */ | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 447 | ret = gnutls_dh_params_init(&mc.dh_params); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 448 | if(ret != GNUTLS_E_SUCCESS){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 449 | fprintf(stderr, "Error in GnuTLS DH parameter initialization:" | 
| 450 | " %s\n", safer_gnutls_strerror(ret)); | |
| 24.1.20
by Björn Påhlsson mandosclient | 451 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 452 | } | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 453 | ret = gnutls_dh_params_generate2(mc.dh_params, mc.dh_bits); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 454 | if(ret != GNUTLS_E_SUCCESS){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 455 | fprintf(stderr, "Error in GnuTLS prime generation: %s\n", | 
| 456 | safer_gnutls_strerror(ret)); | |
| 24.1.20
by Björn Påhlsson mandosclient | 457 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 458 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 459 |   
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 460 | gnutls_certificate_set_dh_params(mc.cred, mc.dh_params); | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 461 |   
 | 
| 24.1.13
by Björn Påhlsson mandosclient | 462 | return 0; | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 463 |   
 | 
| 24.1.20
by Björn Påhlsson mandosclient | 464 | globalfail: | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 465 |   
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 466 | gnutls_certificate_free_credentials(mc.cred); | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 467 | gnutls_global_deinit(); | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 468 | gnutls_dh_params_deinit(mc.dh_params); | 
| 24.1.20
by Björn Påhlsson mandosclient | 469 | return -1; | 
| 24.1.13
by Björn Påhlsson mandosclient | 470 | }
 | 
| 471 | ||
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 472 | static int init_gnutls_session(gnutls_session_t *session){ | 
| 24.1.13
by Björn Påhlsson mandosclient | 473 | int ret; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 474 | /* GnuTLS session creation */ | 
| 475 | ret = gnutls_init(session, GNUTLS_SERVER); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 476 | if(ret != GNUTLS_E_SUCCESS){ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 477 | fprintf(stderr, "Error in GnuTLS session initialization: %s\n", | 
| 13
by Björn Påhlsson Added following support: | 478 | safer_gnutls_strerror(ret)); | 
| 479 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 480 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 481 | { | 
| 482 | const char *err; | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 483 | ret = gnutls_priority_set_direct(*session, mc.priority, &err); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 484 | if(ret != GNUTLS_E_SUCCESS){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 485 | fprintf(stderr, "Syntax error at: %s\n", err); | 
| 486 | fprintf(stderr, "GnuTLS error: %s\n", | |
| 487 | safer_gnutls_strerror(ret)); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 488 | gnutls_deinit(*session); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 489 | return -1; | 
| 490 | } | |
| 13
by Björn Påhlsson Added following support: | 491 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 492 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 493 | ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 494 | mc.cred); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 495 | if(ret != GNUTLS_E_SUCCESS){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 496 | fprintf(stderr, "Error setting GnuTLS credentials: %s\n", | 
| 13
by Björn Påhlsson Added following support: | 497 | safer_gnutls_strerror(ret)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 498 | gnutls_deinit(*session); | 
| 13
by Björn Påhlsson Added following support: | 499 | return -1; | 
| 500 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 501 |   
 | 
| 13
by Björn Påhlsson Added following support: | 502 | /* ignore client certificate if any. */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 503 | gnutls_certificate_server_set_request(*session, | 
| 504 | GNUTLS_CERT_IGNORE); | |
| 13
by Björn Påhlsson Added following support: | 505 |   
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 506 | gnutls_dh_set_prime_bits(*session, mc.dh_bits); | 
| 13
by Björn Påhlsson Added following support: | 507 |   
 | 
| 508 | return 0; | |
| 509 | }
 | |
| 510 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 511 | /* Avahi log function callback */
 | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 512 | static void empty_log(__attribute__((unused)) AvahiLogLevel level, | 
| 513 | __attribute__((unused)) const char *txt){} | |
| 13
by Björn Påhlsson Added following support: | 514 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 515 | /* Called when a Mandos server is found */
 | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 516 | static int start_mandos_communication(const char *ip, uint16_t port, | 
| 24.1.9
by Björn Påhlsson not working midwork... | 517 | AvahiIfIndex if_index, | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 518 | int af){ | 
| 13
by Björn Påhlsson Added following support: | 519 | int ret, tcp_sd; | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 520 | ssize_t sret; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 521 | union { | 
| 522 | struct sockaddr_in in; | |
| 523 | struct sockaddr_in6 in6; | |
| 524 | } to; | |
| 13
by Björn Påhlsson Added following support: | 525 | char *buffer = NULL; | 
| 526 | char *decrypted_buffer; | |
| 527 | size_t buffer_length = 0; | |
| 528 | size_t buffer_capacity = 0; | |
| 529 | ssize_t decrypted_buffer_size; | |
| 24.1.10
by Björn Påhlsson merge commit | 530 | size_t written; | 
| 13
by Björn Påhlsson Added following support: | 531 | int retval = 0; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 532 | gnutls_session_t session; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 533 | int pf; /* Protocol family */ | 
| 534 |   
 | |
| 535 | switch(af){ | |
| 536 | case AF_INET6: | |
| 537 | pf = PF_INET6; | |
| 538 | break; | |
| 539 | case AF_INET: | |
| 540 | pf = PF_INET; | |
| 541 | break; | |
| 542 | default: | |
| 543 | fprintf(stderr, "Bad address family: %d\n", af); | |
| 544 | return -1; | |
| 545 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 546 |   
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 547 | ret = init_gnutls_session(&session); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 548 | if(ret != 0){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 549 | return -1; | 
| 550 | } | |
| 551 |   
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 552 | if(debug){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 553 | fprintf(stderr, "Setting up a TCP connection to %s, port %" PRIu16 | 
| 60
by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing. | 554 | "\n", ip, port); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 555 | } | 
| 13
by Björn Påhlsson Added following support: | 556 |   
 | 
| 304
by Teddy Hogeborn Four new interrelated features: | 557 | tcp_sd = socket(pf, SOCK_STREAM, 0); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 558 | if(tcp_sd < 0){ | 
| 13
by Björn Påhlsson Added following support: | 559 | perror("socket"); | 
| 560 | return -1; | |
| 561 | } | |
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 562 |   
 | 
| 84
by Teddy Hogeborn * Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do | 563 | memset(&to, 0, sizeof(to)); | 
| 304
by Teddy Hogeborn Four new interrelated features: | 564 | if(af == AF_INET6){ | 
| 565 | to.in6.sin6_family = (uint16_t)af; | |
| 566 | ret = inet_pton(af, ip, &to.in6.sin6_addr); | |
| 567 | } else { /* IPv4 */ | |
| 568 | to.in.sin_family = (sa_family_t)af; | |
| 569 | ret = inet_pton(af, ip, &to.in.sin_addr); | |
| 570 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 571 | if(ret < 0 ){ | 
| 13
by Björn Påhlsson Added following support: | 572 | perror("inet_pton"); | 
| 573 | return -1; | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 574 | } | 
| 13
by Björn Påhlsson Added following support: | 575 | if(ret == 0){ | 
| 576 | fprintf(stderr, "Bad address: %s\n", ip); | |
| 577 | return -1; | |
| 578 | } | |
| 304
by Teddy Hogeborn Four new interrelated features: | 579 | if(af == AF_INET6){ | 
| 580 | to.in6.sin6_port = htons(port); /* Spurious warnings from | |
| 581 | 				       -Wconversion and
 | |
| 582 | 				       -Wunreachable-code */
 | |
| 583 |     
 | |
| 584 | if(IN6_IS_ADDR_LINKLOCAL /* Spurious warnings from */ | |
| 585 | (&to.in6.sin6_addr)){ /* -Wstrict-aliasing=2 or lower and | |
| 586 | 			      -Wunreachable-code*/
 | |
| 587 | if(if_index == AVAHI_IF_UNSPEC){ | |
| 588 | fprintf(stderr, "An IPv6 link-local address is incomplete" | |
| 589 | " without a network interface\n"); | |
| 590 | return -1; | |
| 591 | } | |
| 592 | /* Set the network interface number as scope */ | |
| 593 | to.in6.sin6_scope_id = (uint32_t)if_index; | |
| 594 | } | |
| 595 | } else { | |
| 596 | to.in.sin_port = htons(port); /* Spurious warnings from | |
| 267
by Teddy Hogeborn * plugins.d/mandos-client.c: Only comment changes. | 597 | 				     -Wconversion and
 | 
| 598 | 				     -Wunreachable-code */
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 599 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 600 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 601 | if(debug){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 602 | if(af == AF_INET6 and if_index != AVAHI_IF_UNSPEC){ | 
| 603 | char interface[IF_NAMESIZE]; | |
| 604 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 605 | perror("if_indextoname"); | |
| 606 | } else { | |
| 607 | fprintf(stderr, "Connection to: %s%%%s, port %" PRIu16 "\n", | |
| 608 | ip, interface, port); | |
| 609 | } | |
| 610 | } else { | |
| 611 | fprintf(stderr, "Connection to: %s, port %" PRIu16 "\n", ip, | |
| 612 | port); | |
| 613 | } | |
| 614 | char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ? | |
| 615 | INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = ""; | |
| 616 | const char *pcret; | |
| 617 | if(af == AF_INET6){ | |
| 618 | pcret = inet_ntop(af, &(to.in6.sin6_addr), addrstr, | |
| 619 | sizeof(addrstr)); | |
| 620 | } else { | |
| 621 | pcret = inet_ntop(af, &(to.in.sin_addr), addrstr, | |
| 622 | sizeof(addrstr)); | |
| 623 | } | |
| 624 | if(pcret == NULL){ | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 625 | perror("inet_ntop"); | 
| 626 | } else { | |
| 627 | if(strcmp(addrstr, ip) != 0){ | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 628 | fprintf(stderr, "Canonical address form: %s\n", addrstr); | 
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 629 | } | 
| 630 | } | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 631 | } | 
| 13
by Björn Påhlsson Added following support: | 632 |   
 | 
| 304
by Teddy Hogeborn Four new interrelated features: | 633 | if(af == AF_INET6){ | 
| 634 | ret = connect(tcp_sd, &to.in6, sizeof(to)); | |
| 635 | } else { | |
| 636 | ret = connect(tcp_sd, &to.in, sizeof(to)); /* IPv4 */ | |
| 637 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 638 | if(ret < 0){ | 
| 13
by Björn Påhlsson Added following support: | 639 | perror("connect"); | 
| 640 | return -1; | |
| 641 | } | |
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 642 |   
 | 
| 24.1.12
by Björn Påhlsson merge + | 643 | const char *out = mandos_protocol_version; | 
| 24.1.10
by Björn Påhlsson merge commit | 644 | written = 0; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 645 | while(true){ | 
| 24.1.10
by Björn Påhlsson merge commit | 646 | size_t out_size = strlen(out); | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 647 | ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written, | 
| 24.1.10
by Björn Påhlsson merge commit | 648 | out_size - written)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 649 | if(ret == -1){ | 
| 24.1.10
by Björn Påhlsson merge commit | 650 | perror("write"); | 
| 651 | retval = -1; | |
| 24.1.12
by Björn Påhlsson merge + | 652 | goto mandos_end; | 
| 24.1.10
by Björn Påhlsson merge commit | 653 | } | 
| 24.1.12
by Björn Påhlsson merge + | 654 | written += (size_t)ret; | 
| 24.1.10
by Björn Påhlsson merge commit | 655 | if(written < out_size){ | 
| 656 | continue; | |
| 657 | } else { | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 658 | if(out == mandos_protocol_version){ | 
| 24.1.10
by Björn Påhlsson merge commit | 659 | written = 0; | 
| 660 | out = "\r\n"; | |
| 661 | } else { | |
| 662 | break; | |
| 663 | } | |
| 664 | } | |
| 665 | } | |
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 666 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 667 | if(debug){ | 
| 668 | fprintf(stderr, "Establishing TLS session with %s\n", ip); | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 669 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 670 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 671 | gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) tcp_sd); | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 672 |   
 | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 673 | do{ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 674 | ret = gnutls_handshake(session); | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 675 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | 
| 13
by Björn Påhlsson Added following support: | 676 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 677 | if(ret != GNUTLS_E_SUCCESS){ | 
| 25
by Teddy Hogeborn * mandos-clients.conf ([DEFAULT]): New section. | 678 | if(debug){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 679 | fprintf(stderr, "*** GnuTLS Handshake failed ***\n"); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 680 | gnutls_perror(ret); | 
| 25
by Teddy Hogeborn * mandos-clients.conf ([DEFAULT]): New section. | 681 | } | 
| 13
by Björn Påhlsson Added following support: | 682 | retval = -1; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 683 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 684 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 685 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 686 | /* Read OpenPGP packet that contains the wanted password */ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 687 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 688 | if(debug){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 689 | fprintf(stderr, "Retrieving OpenPGP encrypted password from %s\n", | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 690 | ip); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 691 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 692 |   
 | 
| 13
by Björn Påhlsson Added following support: | 693 | while(true){ | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 694 | buffer_capacity = incbuffer(&buffer, buffer_length, | 
| 42
by Teddy Hogeborn * plugins.d/mandosclient.c (start_mandos_communication): Change "to" | 695 | buffer_capacity); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 696 | if(buffer_capacity == 0){ | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 697 | perror("incbuffer"); | 
| 24.1.10
by Björn Påhlsson merge commit | 698 | retval = -1; | 
| 24.1.12
by Björn Påhlsson merge + | 699 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 700 | } | 
| 701 |     
 | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 702 | sret = gnutls_record_recv(session, buffer+buffer_length, | 
| 703 | BUFFER_SIZE); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 704 | if(sret == 0){ | 
| 13
by Björn Påhlsson Added following support: | 705 | break; | 
| 706 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 707 | if(sret < 0){ | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 708 | switch(sret){ | 
| 13
by Björn Påhlsson Added following support: | 709 | case GNUTLS_E_INTERRUPTED: | 
| 710 | case GNUTLS_E_AGAIN: | |
| 711 | break; | |
| 712 | case GNUTLS_E_REHANDSHAKE: | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 713 | do{ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 714 | ret = gnutls_handshake(session); | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 715 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 716 | if(ret < 0){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 717 | fprintf(stderr, "*** GnuTLS Re-handshake failed ***\n"); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 718 | gnutls_perror(ret); | 
| 13
by Björn Påhlsson Added following support: | 719 | retval = -1; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 720 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 721 | } | 
| 722 | break; | |
| 723 | default: | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 724 | fprintf(stderr, "Unknown error while reading data from" | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 725 | " encrypted session with Mandos server\n"); | 
| 13
by Björn Påhlsson Added following support: | 726 | retval = -1; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 727 | gnutls_bye(session, GNUTLS_SHUT_RDWR); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 728 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 729 | } | 
| 730 | } else { | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 731 | buffer_length += (size_t) sret; | 
| 13
by Björn Påhlsson Added following support: | 732 | } | 
| 733 | } | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 734 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 735 | if(debug){ | 
| 736 | fprintf(stderr, "Closing TLS session\n"); | |
| 737 | } | |
| 738 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 739 | gnutls_bye(session, GNUTLS_SHUT_RDWR); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 740 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 741 | if(buffer_length > 0){ | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 742 | decrypted_buffer_size = pgp_packet_decrypt(buffer, | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 743 | buffer_length, | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 744 | &decrypted_buffer); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 745 | if(decrypted_buffer_size >= 0){ | 
| 24.1.10
by Björn Påhlsson merge commit | 746 | written = 0; | 
| 28
by Teddy Hogeborn * server.conf: New file. | 747 | while(written < (size_t) decrypted_buffer_size){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 748 | ret = (int)fwrite(decrypted_buffer + written, 1, | 
| 749 | (size_t)decrypted_buffer_size - written, | |
| 750 | stdout); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 751 | if(ret == 0 and ferror(stdout)){ | 
| 752 | if(debug){ | |
| 753 | fprintf(stderr, "Error writing encrypted data: %s\n", | |
| 754 | strerror(errno)); | |
| 755 | } | |
| 756 | retval = -1; | |
| 757 | break; | |
| 758 | } | |
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 759 | written += (size_t)ret; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 760 | } | 
| 13
by Björn Påhlsson Added following support: | 761 | free(decrypted_buffer); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 762 | } else { | 
| 763 | retval = -1; | |
| 13
by Björn Påhlsson Added following support: | 764 | } | 
| 24.1.63
by Björn Påhlsson merge + fallback bugg | 765 | } else { | 
| 766 | retval = -1; | |
| 13
by Björn Påhlsson Added following support: | 767 | } | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 768 |   
 | 
| 769 | /* Shutdown procedure */ | |
| 770 |   
 | |
| 771 | mandos_end: | |
| 13
by Björn Påhlsson Added following support: | 772 | free(buffer); | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 773 | ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 774 | if(ret == -1){ | 
| 775 | perror("close"); | |
| 776 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 777 | gnutls_deinit(session); | 
| 13
by Björn Påhlsson Added following support: | 778 | return retval; | 
| 779 | }
 | |
| 780 | ||
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 781 | static void resolve_callback(AvahiSServiceResolver *r, | 
| 782 | AvahiIfIndex interface, | |
| 304
by Teddy Hogeborn Four new interrelated features: | 783 | AvahiProtocol proto, | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 784 | AvahiResolverEvent event, | 
| 785 | const char *name, | |
| 786 | const char *type, | |
| 787 | const char *domain, | |
| 788 | const char *host_name, | |
| 789 | const AvahiAddress *address, | |
| 790 | uint16_t port, | |
| 791 | AVAHI_GCC_UNUSED AvahiStringList *txt, | |
| 792 | AVAHI_GCC_UNUSED AvahiLookupResultFlags | |
| 793 | flags, | |
| 307
by Teddy Hogeborn Merge from Björn: | 794 | AVAHI_GCC_UNUSED void* userdata){ | 
| 84
by Teddy Hogeborn * Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do | 795 | assert(r); | 
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 796 |   
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 797 | /* Called whenever a service has been resolved successfully or | 
| 798 |      timed out */
 | |
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 799 |   
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 800 | switch(event){ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 801 | default: | 
| 802 | case AVAHI_RESOLVER_FAILURE: | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 803 | fprintf(stderr, "(Avahi Resolver) Failed to resolve service '%s'" | 
| 804 | " of type '%s' in domain '%s': %s\n", name, type, domain, | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 805 | avahi_strerror(avahi_server_errno(mc.server))); | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 806 | break; | 
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 807 |     
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 808 | case AVAHI_RESOLVER_FOUND: | 
| 809 | { | |
| 810 | char ip[AVAHI_ADDRESS_STR_MAX]; | |
| 811 | avahi_address_snprint(ip, sizeof(ip), address); | |
| 812 | if(debug){ | |
| 60
by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing. | 813 | fprintf(stderr, "Mandos server \"%s\" found on %s (%s, %" | 
| 268
by Teddy Hogeborn Fixes for sscanf usage: | 814 | PRIdMAX ") on port %" PRIu16 "\n", name, host_name, | 
| 815 | ip, (intmax_t)interface, port); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 816 | } | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 817 | int ret = start_mandos_communication(ip, port, interface, | 
| 304
by Teddy Hogeborn Four new interrelated features: | 818 | avahi_proto_to_af(proto)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 819 | if(ret == 0){ | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 820 | avahi_simple_poll_quit(mc.simple_poll); | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 821 | } | 
| 13
by Björn Påhlsson Added following support: | 822 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 823 | } | 
| 824 | avahi_s_service_resolver_free(r); | |
| 13
by Björn Påhlsson Added following support: | 825 | }
 | 
| 826 | ||
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 827 | static void browse_callback(AvahiSServiceBrowser *b, | 
| 828 | AvahiIfIndex interface, | |
| 829 | AvahiProtocol protocol, | |
| 830 | AvahiBrowserEvent event, | |
| 831 | const char *name, | |
| 832 | const char *type, | |
| 833 | const char *domain, | |
| 834 | AVAHI_GCC_UNUSED AvahiLookupResultFlags | |
| 835 | flags, | |
| 307
by Teddy Hogeborn Merge from Björn: | 836 | AVAHI_GCC_UNUSED void* userdata){ | 
| 84
by Teddy Hogeborn * Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do | 837 | assert(b); | 
| 24.1.9
by Björn Påhlsson not working midwork... | 838 |   
 | 
| 839 | /* Called whenever a new services becomes available on the LAN or | |
| 840 |      is removed from the LAN */
 | |
| 841 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 842 | switch(event){ | 
| 24.1.9
by Björn Påhlsson not working midwork... | 843 | default: | 
| 844 | case AVAHI_BROWSER_FAILURE: | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 845 |     
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 846 | fprintf(stderr, "(Avahi browser) %s\n", | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 847 | avahi_strerror(avahi_server_errno(mc.server))); | 
| 848 | avahi_simple_poll_quit(mc.simple_poll); | |
| 24.1.9
by Björn Påhlsson not working midwork... | 849 | return; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 850 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 851 | case AVAHI_BROWSER_NEW: | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 852 | /* We ignore the returned Avahi resolver object. In the callback | 
| 853 |        function we free it. If the Avahi server is terminated before
 | |
| 854 |        the callback function is called the Avahi server will free the
 | |
| 855 |        resolver for us. */
 | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 856 |     
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 857 | if(!(avahi_s_service_resolver_new(mc.server, interface, | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 858 | protocol, name, type, domain, | 
| 24.1.9
by Björn Påhlsson not working midwork... | 859 | AVAHI_PROTO_INET6, 0, | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 860 | resolve_callback, NULL))) | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 861 | fprintf(stderr, "Avahi: Failed to resolve service '%s': %s\n", | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 862 | name, avahi_strerror(avahi_server_errno(mc.server))); | 
| 24.1.9
by Björn Påhlsson not working midwork... | 863 | break; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 864 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 865 | case AVAHI_BROWSER_REMOVE: | 
| 866 | break; | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 867 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 868 | case AVAHI_BROWSER_ALL_FOR_NOW: | 
| 869 | case AVAHI_BROWSER_CACHE_EXHAUSTED: | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 870 | if(debug){ | 
| 871 | fprintf(stderr, "No Mandos server found, still searching...\n"); | |
| 872 | } | |
| 24.1.9
by Björn Påhlsson not working midwork... | 873 | break; | 
| 874 | } | |
| 13
by Björn Påhlsson Added following support: | 875 | }
 | 
| 876 | ||
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 877 | sig_atomic_t quit_now = 0; | 
| 878 | ||
| 24.1.135
by Björn Påhlsson Earlier signal handling | 879 | /* stop main loop after sigterm has been called */
 | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 880 | static void handle_sigterm(__attribute__((unused)) int sig){ | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 881 | if(quit_now){ | 
| 882 | return; | |
| 883 | } | |
| 884 | quit_now = 1; | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 885 | int old_errno = errno; | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 886 | if(mc.simple_poll != NULL){ | 
| 887 | avahi_simple_poll_quit(mc.simple_poll); | |
| 888 | } | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 889 | errno = old_errno; | 
| 890 | }
 | |
| 891 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 892 | int main(int argc, char *argv[]){ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 893 | AvahiSServiceBrowser *sb = NULL; | 
| 894 | int error; | |
| 895 | int ret; | |
| 896 | intmax_t tmpmax; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 897 | char *tmp; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 898 | int exitcode = EXIT_SUCCESS; | 
| 899 | const char *interface = "eth0"; | |
| 900 | struct ifreq network; | |
| 901 | int sd; | |
| 902 | uid_t uid; | |
| 903 | gid_t gid; | |
| 904 | char *connect_to = NULL; | |
| 905 | char tempdir[] = "/tmp/mandosXXXXXX"; | |
| 906 | bool tempdir_created = false; | |
| 907 | AvahiIfIndex if_index = AVAHI_IF_UNSPEC; | |
| 908 | const char *seckey = PATHDIR "/" SECKEY; | |
| 909 | const char *pubkey = PATHDIR "/" PUBKEY; | |
| 910 |   
 | |
| 307
by Teddy Hogeborn Merge from Björn: | 911 | /* Initialize Mandos context */ | 
| 912 | mc = (mandos_context){ .simple_poll = NULL, .server = NULL, | |
| 913 | .dh_bits = 1024, .priority = "SECURE256" | |
| 914 | ":!CTYPE-X.509:+CTYPE-OPENPGP" }; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 915 | bool gnutls_initialized = false; | 
| 916 | bool gpgme_initialized = false; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 917 | float delay = 2.5f; | 
| 918 |   
 | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 919 | struct sigaction old_sigterm_action; | 
| 920 | struct sigaction sigterm_action = { .sa_handler = handle_sigterm }; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 921 |   
 | 
| 922 | { | |
| 923 | struct argp_option options[] = { | |
| 924 | { .name = "debug", .key = 128, | |
| 925 | .doc = "Debug mode", .group = 3 }, | |
| 926 | { .name = "connect", .key = 'c', | |
| 927 | .arg = "ADDRESS:PORT", | |
| 928 | .doc = "Connect directly to a specific Mandos server", | |
| 929 | .group = 1 }, | |
| 930 | { .name = "interface", .key = 'i', | |
| 931 | .arg = "NAME", | |
| 304
by Teddy Hogeborn Four new interrelated features: | 932 | .doc = "Network interface that will be used to search for" | 
| 933 | " Mandos servers", | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 934 | .group = 1 }, | 
| 935 | { .name = "seckey", .key = 's', | |
| 936 | .arg = "FILE", | |
| 937 | .doc = "OpenPGP secret key file base name", | |
| 938 | .group = 1 }, | |
| 939 | { .name = "pubkey", .key = 'p', | |
| 940 | .arg = "FILE", | |
| 941 | .doc = "OpenPGP public key file base name", | |
| 942 | .group = 2 }, | |
| 943 | { .name = "dh-bits", .key = 129, | |
| 944 | .arg = "BITS", | |
| 945 | .doc = "Bit length of the prime number used in the" | |
| 946 | " Diffie-Hellman key exchange", | |
| 947 | .group = 2 }, | |
| 948 | { .name = "priority", .key = 130, | |
| 949 | .arg = "STRING", | |
| 950 | .doc = "GnuTLS priority string for the TLS handshake", | |
| 951 | .group = 1 }, | |
| 952 | { .name = "delay", .key = 131, | |
| 953 | .arg = "SECONDS", | |
| 954 | .doc = "Maximum delay to wait for interface startup", | |
| 955 | .group = 2 }, | |
| 956 | { .name = NULL } | |
| 957 | }; | |
| 958 |     
 | |
| 959 | error_t parse_opt(int key, char *arg, | |
| 960 | struct argp_state *state){ | |
| 961 | switch(key){ | |
| 962 | case 128: /* --debug */ | |
| 963 | debug = true; | |
| 964 | break; | |
| 965 | case 'c': /* --connect */ | |
| 966 | connect_to = arg; | |
| 967 | break; | |
| 968 | case 'i': /* --interface */ | |
| 969 | interface = arg; | |
| 970 | break; | |
| 971 | case 's': /* --seckey */ | |
| 972 | seckey = arg; | |
| 973 | break; | |
| 974 | case 'p': /* --pubkey */ | |
| 975 | pubkey = arg; | |
| 976 | break; | |
| 977 | case 129: /* --dh-bits */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 978 | errno = 0; | 
| 979 | tmpmax = strtoimax(arg, &tmp, 10); | |
| 980 | if(errno != 0 or tmp == arg or *tmp != '\0' | |
| 981 | or tmpmax != (typeof(mc.dh_bits))tmpmax){ | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 982 | fprintf(stderr, "Bad number of DH bits\n"); | 
| 983 | exit(EXIT_FAILURE); | |
| 984 | } | |
| 985 | mc.dh_bits = (typeof(mc.dh_bits))tmpmax; | |
| 986 | break; | |
| 987 | case 130: /* --priority */ | |
| 988 | mc.priority = arg; | |
| 989 | break; | |
| 990 | case 131: /* --delay */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 991 | errno = 0; | 
| 992 | delay = strtof(arg, &tmp); | |
| 993 | if(errno != 0 or tmp == arg or *tmp != '\0'){ | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 994 | fprintf(stderr, "Bad delay\n"); | 
| 995 | exit(EXIT_FAILURE); | |
| 996 | } | |
| 997 | break; | |
| 998 | case ARGP_KEY_ARG: | |
| 999 | argp_usage(state); | |
| 1000 | case ARGP_KEY_END: | |
| 1001 | break; | |
| 1002 | default: | |
| 1003 | return ARGP_ERR_UNKNOWN; | |
| 1004 | } | |
| 1005 | return 0; | |
| 1006 | } | |
| 1007 |     
 | |
| 1008 | struct argp argp = { .options = options, .parser = parse_opt, | |
| 1009 | .args_doc = "", | |
| 1010 | .doc = "Mandos client -- Get and decrypt" | |
| 1011 | " passwords from a Mandos server" }; | |
| 1012 | ret = argp_parse(&argp, argc, argv, 0, 0, NULL); | |
| 1013 | if(ret == ARGP_ERR_UNKNOWN){ | |
| 1014 | fprintf(stderr, "Unknown error while parsing arguments\n"); | |
| 1015 | exitcode = EXIT_FAILURE; | |
| 1016 | goto end; | |
| 1017 | } | |
| 1018 | } | |
| 1019 |   
 | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 1020 | if(not debug){ | 
| 1021 | avahi_set_log_function(empty_log); | |
| 1022 | } | |
| 309
by Teddy Hogeborn Merge from Björn: | 1023 |   
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 1024 | /* Initialize Avahi early so avahi_simple_poll_quit() can be called | 
| 1025 |      from the signal handler */
 | |
| 1026 | /* Initialize the pseudo-RNG for Avahi */ | |
| 1027 | srand((unsigned int) time(NULL)); | |
| 1028 | mc.simple_poll = avahi_simple_poll_new(); | |
| 1029 | if(mc.simple_poll == NULL){ | |
| 1030 | fprintf(stderr, "Avahi: Failed to create simple poll object.\n"); | |
| 1031 | exitcode = EXIT_FAILURE; | |
| 1032 | goto end; | |
| 1033 | } | |
| 309
by Teddy Hogeborn Merge from Björn: | 1034 |   
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 1035 | sigemptyset(&sigterm_action.sa_mask); | 
| 309
by Teddy Hogeborn Merge from Björn: | 1036 | ret = sigaddset(&sigterm_action.sa_mask, SIGINT); | 
| 1037 | if(ret == -1){ | |
| 1038 | perror("sigaddset"); | |
| 1039 | exitcode = EXIT_FAILURE; | |
| 1040 | goto end; | |
| 1041 | } | |
| 1042 | ret = sigaddset(&sigterm_action.sa_mask, SIGHUP); | |
| 1043 | if(ret == -1){ | |
| 1044 | perror("sigaddset"); | |
| 1045 | exitcode = EXIT_FAILURE; | |
| 1046 | goto end; | |
| 1047 | } | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 1048 | ret = sigaddset(&sigterm_action.sa_mask, SIGTERM); | 
| 1049 | if(ret == -1){ | |
| 1050 | perror("sigaddset"); | |
| 1051 | exitcode = EXIT_FAILURE; | |
| 1052 | goto end; | |
| 1053 | } | |
| 1054 | ret = sigaction(SIGTERM, &sigterm_action, &old_sigterm_action); | |
| 1055 | if(ret == -1){ | |
| 1056 | perror("sigaction"); | |
| 1057 | exitcode = EXIT_FAILURE; | |
| 1058 | goto end; | |
| 1059 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1060 |   
 | 
| 1061 | /* If the interface is down, bring it up */ | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1062 | if(interface[0] != '\0'){ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1063 | #ifdef __linux__
 | 
| 1064 | /* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO | |
| 1065 |        messages to mess up the prompt */
 | |
| 1066 | ret = klogctl(8, NULL, 5); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1067 | bool restore_loglevel = true; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1068 | if(ret == -1){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1069 | restore_loglevel = false; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1070 | perror("klogctl"); | 
| 1071 | } | |
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1072 | #endif /* __linux__ */ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1073 |     
 | 
| 1074 | sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | |
| 1075 | if(sd < 0){ | |
| 1076 | perror("socket"); | |
| 1077 | exitcode = EXIT_FAILURE; | |
| 1078 | #ifdef __linux__
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1079 | if(restore_loglevel){ | 
| 1080 | ret = klogctl(7, NULL, 0); | |
| 1081 | if(ret == -1){ | |
| 1082 | perror("klogctl"); | |
| 1083 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1084 | } | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1085 | #endif /* __linux__ */ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1086 | goto end; | 
| 1087 | } | |
| 1088 | strcpy(network.ifr_name, interface); | |
| 1089 | ret = ioctl(sd, SIOCGIFFLAGS, &network); | |
| 1090 | if(ret == -1){ | |
| 1091 | perror("ioctl SIOCGIFFLAGS"); | |
| 1092 | #ifdef __linux__
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1093 | if(restore_loglevel){ | 
| 1094 | ret = klogctl(7, NULL, 0); | |
| 1095 | if(ret == -1){ | |
| 1096 | perror("klogctl"); | |
| 1097 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1098 | } | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1099 | #endif /* __linux__ */ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1100 | exitcode = EXIT_FAILURE; | 
| 1101 | goto end; | |
| 1102 | } | |
| 1103 | if((network.ifr_flags & IFF_UP) == 0){ | |
| 1104 | network.ifr_flags |= IFF_UP; | |
| 1105 | ret = ioctl(sd, SIOCSIFFLAGS, &network); | |
| 1106 | if(ret == -1){ | |
| 1107 | perror("ioctl SIOCSIFFLAGS"); | |
| 1108 | exitcode = EXIT_FAILURE; | |
| 1109 | #ifdef __linux__
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1110 | if(restore_loglevel){ | 
| 1111 | ret = klogctl(7, NULL, 0); | |
| 1112 | if(ret == -1){ | |
| 1113 | perror("klogctl"); | |
| 1114 | } | |
| 24.1.124
by Björn Påhlsson Added lower kernel loglevel to reduce clutter on system console. | 1115 | } | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1116 | #endif /* __linux__ */ | 
| 65
by Teddy Hogeborn * plugins.d/password-request.c (main): Bug fix: Bring up network | 1117 | goto end; | 
| 1118 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1119 | } | 
| 1120 | /* sleep checking until interface is running */ | |
| 1121 | for(int i=0; i < delay * 4; i++){ | |
| 65
by Teddy Hogeborn * plugins.d/password-request.c (main): Bug fix: Bring up network | 1122 | ret = ioctl(sd, SIOCGIFFLAGS, &network); | 
| 1123 | if(ret == -1){ | |
| 1124 | perror("ioctl SIOCGIFFLAGS"); | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1125 | } else if(network.ifr_flags & IFF_RUNNING){ | 
| 1126 | break; | |
| 1127 | } | |
| 1128 | struct timespec sleeptime = { .tv_nsec = 250000000 }; | |
| 1129 | ret = nanosleep(&sleeptime, NULL); | |
| 1130 | if(ret == -1 and errno != EINTR){ | |
| 1131 | perror("nanosleep"); | |
| 1132 | } | |
| 1133 | } | |
| 1134 | ret = (int)TEMP_FAILURE_RETRY(close(sd)); | |
| 1135 | if(ret == -1){ | |
| 1136 | perror("close"); | |
| 1137 | } | |
| 1138 | #ifdef __linux__
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1139 | if(restore_loglevel){ | 
| 1140 | /* Restores kernel loglevel to default */ | |
| 1141 | ret = klogctl(7, NULL, 0); | |
| 1142 | if(ret == -1){ | |
| 1143 | perror("klogctl"); | |
| 1144 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1145 | } | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1146 | #endif /* __linux__ */ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1147 | } | 
| 1148 |   
 | |
| 1149 | uid = getuid(); | |
| 1150 | gid = getgid(); | |
| 1151 |   
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1152 | errno = 0; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1153 | setgid(gid); | 
| 1154 | if(ret == -1){ | |
| 1155 | perror("setgid"); | |
| 1156 | } | |
| 1157 |   
 | |
| 1158 | ret = setuid(uid); | |
| 1159 | if(ret == -1){ | |
| 1160 | perror("setuid"); | |
| 1161 | } | |
| 1162 |   
 | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1163 | ret = init_gnutls_global(pubkey, seckey); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1164 | if(ret == -1){ | 
| 1165 | fprintf(stderr, "init_gnutls_global failed\n"); | |
| 1166 | exitcode = EXIT_FAILURE; | |
| 1167 | goto end; | |
| 1168 | } else { | |
| 1169 | gnutls_initialized = true; | |
| 1170 | } | |
| 1171 |   
 | |
| 1172 | if(mkdtemp(tempdir) == NULL){ | |
| 1173 | perror("mkdtemp"); | |
| 1174 | goto end; | |
| 1175 | } | |
| 1176 | tempdir_created = true; | |
| 1177 |   
 | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1178 | if(not init_gpgme(pubkey, seckey, tempdir)){ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1179 | fprintf(stderr, "init_gpgme failed\n"); | 
| 1180 | exitcode = EXIT_FAILURE; | |
| 1181 | goto end; | |
| 1182 | } else { | |
| 1183 | gpgme_initialized = true; | |
| 1184 | } | |
| 1185 |   
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1186 | if(interface[0] != '\0'){ | 
| 1187 | if_index = (AvahiIfIndex) if_nametoindex(interface); | |
| 1188 | if(if_index == 0){ | |
| 1189 | fprintf(stderr, "No such interface: \"%s\"\n", interface); | |
| 1190 | exitcode = EXIT_FAILURE; | |
| 1191 | goto end; | |
| 1192 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1193 | } | 
| 1194 |   
 | |
| 1195 | if(connect_to != NULL){ | |
| 1196 | /* Connect directly, do not use Zeroconf */ | |
| 1197 | /* (Mainly meant for debugging) */ | |
| 1198 | char *address = strrchr(connect_to, ':'); | |
| 1199 | if(address == NULL){ | |
| 1200 | fprintf(stderr, "No colon in address\n"); | |
| 1201 | exitcode = EXIT_FAILURE; | |
| 1202 | goto end; | |
| 1203 | } | |
| 1204 | uint16_t port; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 1205 | errno = 0; | 
| 1206 | tmpmax = strtoimax(address+1, &tmp, 10); | |
| 1207 | if(errno != 0 or tmp == address+1 or *tmp != '\0' | |
| 1208 | or tmpmax != (uint16_t)tmpmax){ | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1209 | fprintf(stderr, "Bad port number\n"); | 
| 1210 | exitcode = EXIT_FAILURE; | |
| 1211 | goto end; | |
| 1212 | } | |
| 1213 | port = (uint16_t)tmpmax; | |
| 1214 | *address = '\0'; | |
| 1215 | address = connect_to; | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1216 | /* Colon in address indicates IPv6 */ | 
| 1217 | int af; | |
| 1218 | if(strchr(address, ':') != NULL){ | |
| 1219 | af = AF_INET6; | |
| 1220 | } else { | |
| 1221 | af = AF_INET; | |
| 1222 | } | |
| 307
by Teddy Hogeborn Merge from Björn: | 1223 | ret = start_mandos_communication(address, port, if_index, af); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1224 | if(ret < 0){ | 
| 1225 | exitcode = EXIT_FAILURE; | |
| 1226 | } else { | |
| 1227 | exitcode = EXIT_SUCCESS; | |
| 1228 | } | |
| 1229 | goto end; | |
| 1230 | } | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 1231 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1232 | { | 
| 1233 | AvahiServerConfig config; | |
| 1234 | /* Do not publish any local Zeroconf records */ | |
| 1235 | avahi_server_config_init(&config); | |
| 1236 | config.publish_hinfo = 0; | |
| 1237 | config.publish_addresses = 0; | |
| 1238 | config.publish_workstation = 0; | |
| 1239 | config.publish_domain = 0; | |
| 1240 |     
 | |
| 1241 | /* Allocate a new server */ | |
| 1242 | mc.server = avahi_server_new(avahi_simple_poll_get | |
| 1243 | (mc.simple_poll), &config, NULL, | |
| 1244 | NULL, &error); | |
| 1245 |     
 | |
| 1246 | /* Free the Avahi configuration data */ | |
| 1247 | avahi_server_config_free(&config); | |
| 1248 | } | |
| 1249 |   
 | |
| 1250 | /* Check if creating the Avahi server object succeeded */ | |
| 1251 | if(mc.server == NULL){ | |
| 1252 | fprintf(stderr, "Failed to create Avahi server: %s\n", | |
| 1253 | avahi_strerror(error)); | |
| 1254 | exitcode = EXIT_FAILURE; | |
| 1255 | goto end; | |
| 1256 | } | |
| 1257 |   
 | |
| 1258 | /* Create the Avahi service browser */ | |
| 1259 | sb = avahi_s_service_browser_new(mc.server, if_index, | |
| 1260 | AVAHI_PROTO_INET6, "_mandos._tcp", | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1261 | NULL, 0, browse_callback, NULL); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1262 | if(sb == NULL){ | 
| 1263 | fprintf(stderr, "Failed to create service browser: %s\n", | |
| 1264 | avahi_strerror(avahi_server_errno(mc.server))); | |
| 1265 | exitcode = EXIT_FAILURE; | |
| 1266 | goto end; | |
| 1267 | } | |
| 307
by Teddy Hogeborn Merge from Björn: | 1268 |   
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1269 | /* Run the main loop */ | 
| 1270 |   
 | |
| 1271 | if(debug){ | |
| 1272 | fprintf(stderr, "Starting Avahi loop search\n"); | |
| 1273 | } | |
| 1274 |   
 | |
| 1275 | avahi_simple_poll_loop(mc.simple_poll); | |
| 1276 |   
 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1277 | end: | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1278 |   
 | 
| 1279 | if(debug){ | |
| 1280 | fprintf(stderr, "%s exiting\n", argv[0]); | |
| 1281 | } | |
| 1282 |   
 | |
| 1283 | /* Cleanup things */ | |
| 1284 | if(sb != NULL) | |
| 1285 | avahi_s_service_browser_free(sb); | |
| 1286 |   
 | |
| 1287 | if(mc.server != NULL) | |
| 1288 | avahi_server_free(mc.server); | |
| 1289 |   
 | |
| 1290 | if(mc.simple_poll != NULL) | |
| 1291 | avahi_simple_poll_free(mc.simple_poll); | |
| 1292 |   
 | |
| 1293 | if(gnutls_initialized){ | |
| 1294 | gnutls_certificate_free_credentials(mc.cred); | |
| 1295 | gnutls_global_deinit(); | |
| 1296 | gnutls_dh_params_deinit(mc.dh_params); | |
| 1297 | } | |
| 1298 |   
 | |
| 1299 | if(gpgme_initialized){ | |
| 1300 | gpgme_release(mc.ctx); | |
| 1301 | } | |
| 1302 |   
 | |
| 1303 | /* Removes the temp directory used by GPGME */ | |
| 1304 | if(tempdir_created){ | |
| 1305 | DIR *d; | |
| 1306 | struct dirent *direntry; | |
| 1307 | d = opendir(tempdir); | |
| 1308 | if(d == NULL){ | |
| 1309 | if(errno != ENOENT){ | |
| 1310 | perror("opendir"); | |
| 1311 | } | |
| 1312 | } else { | |
| 1313 | while(true){ | |
| 1314 | direntry = readdir(d); | |
| 1315 | if(direntry == NULL){ | |
| 1316 | break; | |
| 1317 | } | |
| 1318 | /* Skip "." and ".." */ | |
| 1319 | if(direntry->d_name[0] == '.' | |
| 1320 | and (direntry->d_name[1] == '\0' | |
| 1321 | or (direntry->d_name[1] == '.' | |
| 1322 | and direntry->d_name[2] == '\0'))){ | |
| 1323 | continue; | |
| 1324 | } | |
| 1325 | char *fullname = NULL; | |
| 1326 | ret = asprintf(&fullname, "%s/%s", tempdir, | |
| 1327 | direntry->d_name); | |
| 1328 | if(ret < 0){ | |
| 1329 | perror("asprintf"); | |
| 1330 | continue; | |
| 1331 | } | |
| 1332 | ret = remove(fullname); | |
| 1333 | if(ret == -1){ | |
| 1334 | fprintf(stderr, "remove(\"%s\"): %s\n", fullname, | |
| 1335 | strerror(errno)); | |
| 1336 | } | |
| 1337 | free(fullname); | |
| 1338 | } | |
| 1339 | closedir(d); | |
| 1340 | } | |
| 1341 | ret = rmdir(tempdir); | |
| 1342 | if(ret == -1 and errno != ENOENT){ | |
| 1343 | perror("rmdir"); | |
| 1344 | } | |
| 1345 | } | |
| 1346 |   
 | |
| 1347 | return exitcode; | |
| 13
by Björn Påhlsson Added following support: | 1348 | }
 |