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