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