/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/password-prompt.c

  • Committer: Teddy Hogeborn
  • Date: 2009-05-17 00:50:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090517005009-c0iptxampo6nf177
* initramfs-tools-hook-conf: Security bug fix: Add code to handle
                             being called by "mkinitramfs-kpkg"
                             instead of "update-initramfs".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/*  -*- coding: utf-8; mode: c; mode: orgtbl -*- */
 
1
/*  -*- coding: utf-8 -*- */
2
2
/*
3
3
 * Password-prompt - Read a password from the terminal and print it
4
4
 * 
33
33
#include <signal.h>             /* sig_atomic_t, raise(), struct
34
34
                                   sigaction, sigemptyset(),
35
35
                                   sigaction(), sigaddset(), SIGINT,
36
 
                                   SIGQUIT, SIGHUP, SIGTERM,
37
 
                                   raise() */
 
36
                                   SIGQUIT, SIGHUP, SIGTERM */
38
37
#include <stddef.h>             /* NULL, size_t, ssize_t */
39
38
#include <sys/types.h>          /* ssize_t */
40
39
#include <stdlib.h>             /* EXIT_SUCCESS, EXIT_FAILURE,
53
52
                                   ARGP_ERR_UNKNOWN */
54
53
 
55
54
volatile sig_atomic_t quit_now = 0;
56
 
int signal_received;
57
55
bool debug = false;
58
56
const char *argp_program_version = "password-prompt " VERSION;
59
57
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
60
58
 
61
 
static void termination_handler(int signum){
62
 
  if(quit_now){
63
 
    return;
64
 
  }
 
59
static void termination_handler(__attribute__((unused))int signum){
65
60
  quit_now = 1;
66
 
  signal_received = signum;
67
61
}
68
62
 
69
63
int main(int argc, char **argv){
137
131
    perror("sigaction");
138
132
    return EXIT_FAILURE;
139
133
  }
140
 
  /* Need to check if the handler is SIG_IGN before handling:
141
 
     | [[info:libc:Initial Signal Actions]] |
142
 
     | [[info:libc:Basic Signal Handling]]  |
143
 
  */
144
134
  if(old_action.sa_handler != SIG_IGN){
145
135
    ret = sigaction(SIGINT, &new_action, NULL);
146
136
    if(ret == -1){
204
194
      const char *cryptsource = getenv("cryptsource");
205
195
      const char *crypttarget = getenv("crypttarget");
206
196
      const char *const prompt
207
 
        = "Enter passphrase to unlock the disk";
 
197
        = "Enter passphrase to unlock the disk";      
208
198
      if(cryptsource == NULL){
209
199
        if(crypttarget == NULL){
210
200
          fprintf(stderr, "%s: ", prompt);
252
242
    /* if(ret == 0), then the only sensible thing to do is to retry to
253
243
       read from stdin */
254
244
    fputc('\n', stderr);
255
 
    if(debug and not quit_now){
 
245
    if(debug and quit_now == 0){
256
246
      /* If quit_now is nonzero, we were interrupted by a signal, and
257
247
         will print that later, so no need to show this too. */
258
248
      fprintf(stderr, "getline() returned 0, retrying.\n");
268
258
    perror("tcsetattr+echo");
269
259
  }
270
260
  
271
 
  if(quit_now){
272
 
    sigemptyset(&old_action.sa_mask);
273
 
    old_action.sa_handler = SIG_DFL;
274
 
    ret = sigaction(signal_received, &old_action, NULL);
275
 
    if(ret == -1){
276
 
      perror("sigaction");
277
 
    }
278
 
    raise(signal_received);
279
 
  }
280
 
  
281
261
  if(debug){
282
262
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
283
263
            status);