← Back to branch summary

~peter-pearse/ubuntu/natty/libgcrypt11/prop001

« back to all changes in this revision

Viewing changes to src/global.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2007-04-09 11:22:41 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070409112241-hzwl3tex8cmr2dkz
Tags: 1.2.4-2
http://bugs.debian.org/405238
http://bugs.debian.org/403613
* Upload to unstable.
* Drop -lgpg-error from libgcrypt-config --libs output. (Closes: #405238)
* Switch to debhelper v5 mode.
* New upstream version closes filehandles in gcry_rndlinux_gather_random().
  (Closes: #403613)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/global.c
209
209
    case GCRYCTL_INIT_SECMEM:
210
210
      global_init ();
211
211
      _gcry_secmem_init (va_arg (arg_ptr, unsigned int));
 
212
      if ((_gcry_secmem_get_flags () & GCRY_SECMEM_FLAG_NOT_LOCKED))
 
213
        err = GPG_ERR_GENERAL;
212
214
      break;
213
215
 
214
216
    case GCRYCTL_TERM_SECMEM:
587
589
 
588
590
    while ( !(p = gcry_realloc( a, n )) ) {
589
591
        if( !outofcore_handler
590
 
            || !outofcore_handler( outofcore_handler_value, n, 2 ) ) {
 
592
            || !outofcore_handler( outofcore_handler_value, n, 
 
593
                                   gcry_is_secure(a)? 3:2 ) ) {
591
594
            _gcry_fatal_error(gpg_err_code_from_errno (errno), NULL );
592
595
        }
593
596
    }