/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

Merge from Björn:

* mandos-ctl: Changed domain to "se.bsnet.fukt".

* plugin-runner.c (main): Bug fix: remove pseudo-plugin for global
                          plugin arguments after it is no longer
                          needed.

* plugins.d/mandos-client.c (adjustbuffer): Renamed to "incbuffer",
                                            all callers changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
130
130
} mandos_context;
131
131
 
132
132
/*
133
 
 * Make room in "buffer" for at least BUFFER_SIZE additional bytes.
134
 
 * "buffer_capacity" is how much is currently allocated,
135
 
 * "buffer_length" is how much is already used.
 
133
 * Make additional room in "buffer" for at least BUFFER_SIZE
 
134
 * additional bytes. "buffer_capacity" is how much is currently
 
135
 * allocated, "buffer_length" is how much is already used.
136
136
 */
137
 
size_t adjustbuffer(char **buffer, size_t buffer_length,
 
137
size_t incbuffer(char **buffer, size_t buffer_length,
138
138
                  size_t buffer_capacity){
139
139
  if(buffer_length + BUFFER_SIZE > buffer_capacity){
140
140
    *buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
326
326
  
327
327
  *plaintext = NULL;
328
328
  while(true){
329
 
    plaintext_capacity = adjustbuffer(plaintext,
 
329
    plaintext_capacity = incbuffer(plaintext,
330
330
                                      (size_t)plaintext_length,
331
331
                                      plaintext_capacity);
332
332
    if(plaintext_capacity == 0){
333
 
        perror("adjustbuffer");
 
333
        perror("incbuffer");
334
334
        plaintext_length = -1;
335
335
        goto decrypt_end;
336
336
    }
685
685
  }
686
686
  
687
687
  while(true){
688
 
    buffer_capacity = adjustbuffer(&buffer, buffer_length,
 
688
    buffer_capacity = incbuffer(&buffer, buffer_length,
689
689
                                   buffer_capacity);
690
690
    if(buffer_capacity == 0){
691
 
      perror("adjustbuffer");
 
691
      perror("incbuffer");
692
692
      retval = -1;
693
693
      goto mandos_end;
694
694
    }