/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/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2018-04-01 19:27:30 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: teddy@recompile.se-20180401192730-jwr4io5cb3x5u268
Don't print NULL string pointers in error message output

* plugins.d/mandos-client.c (pgp_packet_decrypt): If decryption fails,
  don't print unsupported_algorithm if it is NULL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
9
9
 * "browse_callback", and parts of "main".
10
10
 * 
11
11
 * Everything else is
12
 
 * Copyright © 2008-2016 Teddy Hogeborn
13
 
 * Copyright © 2008-2016 Björn Påhlsson
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
 
12
 * Copyright © 2008-2018 Teddy Hogeborn
 
13
 * Copyright © 2008-2018 Björn Påhlsson
 
14
 * 
 
15
 * This file is part of Mandos.
 
16
 * 
 
17
 * Mandos is free software: you can redistribute it and/or modify it
 
18
 * under the terms of the GNU General Public License as published by
 
19
 * the Free Software Foundation, either version 3 of the License, or
 
20
 * (at your option) any later version.
 
21
 * 
 
22
 * Mandos is distributed in the hope that it will be useful, but
21
23
 * WITHOUT ANY WARRANTY; without even the implied warranty of
22
24
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
23
25
 * General Public License for more details.
24
26
 * 
25
27
 * 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
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
28
29
 * 
29
30
 * Contact the authors at <mandos@recompile.se>.
30
31
 */
419
420
      if(result == NULL){
420
421
        fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
421
422
      } else {
422
 
        fprintf_plus(stderr, "Unsupported algorithm: %s\n",
423
 
                     result->unsupported_algorithm);
 
423
        if(result->unsupported_algorithm != NULL) {
 
424
          fprintf_plus(stderr, "Unsupported algorithm: %s\n",
 
425
                       result->unsupported_algorithm);
 
426
        }
424
427
        fprintf_plus(stderr, "Wrong key usage: %u\n",
425
428
                     result->wrong_key_usage);
426
429
        if(result->file_name != NULL){
612
615
        }
613
616
        params.size += (unsigned int)bytes_read;
614
617
      }
 
618
      ret = close(dhpfile);
 
619
      if(ret == -1){
 
620
        perror_plus("close");
 
621
      }
615
622
      if(params.data == NULL){
616
623
        dhparamsfilename = NULL;
617
624
      }
1079
1086
    bool match = false;
1080
1087
    {
1081
1088
      char *interface = NULL;
1082
 
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
1083
 
                                 interface))){
 
1089
      while((interface = argz_next(mc->interfaces,
 
1090
                                   mc->interfaces_size,
 
1091
                                   interface))){
1084
1092
        if(if_nametoindex(interface) == (unsigned int)if_index){
1085
1093
          match = true;
1086
1094
          break;
1493
1501
  return retval;
1494
1502
}
1495
1503
 
1496
 
__attribute__((nonnull))
1497
1504
static void resolve_callback(AvahiSServiceResolver *r,
1498
1505
                             AvahiIfIndex interface,
1499
1506
                             AvahiProtocol proto,
1654
1661
      perror_plus("ioctl SIOCGIFFLAGS");
1655
1662
      errno = old_errno;
1656
1663
    }
 
1664
    if((close(s) == -1) and debug){
 
1665
      old_errno = errno;
 
1666
      perror_plus("close");
 
1667
      errno = old_errno;
 
1668
    }
1657
1669
    return false;
1658
1670
  }
 
1671
  if((close(s) == -1) and debug){
 
1672
    old_errno = errno;
 
1673
    perror_plus("close");
 
1674
    errno = old_errno;
 
1675
  }
1659
1676
  return true;
1660
1677
}
1661
1678
 
1922
1939
      return;
1923
1940
    }
1924
1941
  }
 
1942
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1943
  if(devnull == -1){
 
1944
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1945
    return;
 
1946
  }
1925
1947
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1926
1948
                           runnable_hook, alphasort);
1927
1949
  if(numhooks == -1){
1928
1950
    perror_plus("scandir");
 
1951
    close(devnull);
1929
1952
    return;
1930
1953
  }
1931
1954
  struct dirent *direntry;
1932
1955
  int ret;
1933
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1934
 
  if(devnull == -1){
1935
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1936
 
    return;
1937
 
  }
1938
1956
  for(int i = 0; i < numhooks; i++){
1939
1957
    direntry = direntries[i];
1940
1958
    if(debug){
2196
2214
  
2197
2215
  /* Sleep checking until interface is running.
2198
2216
     Check every 0.25s, up to total time of delay */
2199
 
  for(int i=0; i < delay * 4; i++){
 
2217
  for(int i = 0; i < delay * 4; i++){
2200
2218
    if(interface_is_running(interface)){
2201
2219
      break;
2202
2220
    }
3023
3041
      /* Take down the network interfaces which were brought up */
3024
3042
      {
3025
3043
        char *interface = NULL;
3026
 
        while((interface=argz_next(interfaces_to_take_down,
3027
 
                                   interfaces_to_take_down_size,
3028
 
                                   interface))){
 
3044
        while((interface = argz_next(interfaces_to_take_down,
 
3045
                                     interfaces_to_take_down_size,
 
3046
                                     interface))){
3029
3047
          ret = take_down_interface(interface);
3030
3048
          if(ret != 0){
3031
3049
            errno = ret;
3060
3078
                                                | O_PATH));
3061
3079
    if(dir_fd == -1){
3062
3080
      perror_plus("open");
 
3081
      return;
3063
3082
    }
3064
3083
    int numentries = scandirat(dir_fd, ".", &direntries,
3065
3084
                               notdotentries, alphasort);
3082
3101
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3083
3102
            dret = 0;
3084
3103
          }
3085
 
          if(dret == -1){
 
3104
          if((dret == -1) and (errno != ENOENT)){
3086
3105
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3087
3106
                         direntries[i]->d_name, strerror(errno));
3088
3107
          }
3092
3111
      
3093
3112
      /* need to clean even if 0 because man page doesn't specify */
3094
3113
      free(direntries);
3095
 
      if(numentries == -1){
3096
 
        perror_plus("scandirat");
3097
 
      }
3098
3114
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3099
3115
      if(dret == -1 and errno != ENOENT){
3100
3116
        perror_plus("rmdir");