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