← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to engines/e_aep.c

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-12-06 20:16:24 UTC
  • mfrom: (11.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091206201624-u126qjpqm2n2uuhu
Tags: 0.9.8k-7ubuntu1
https://launchpad.net/bugs/493392
* Merge from debian unstable, remaining changes (LP: #493392):
  - Link using -Bsymbolic-functions
  - Add support for lpia
  - Disable SSLv2 during compile
  - Ship documentation in openssl-doc, suggested by the package.
  - Use a different priority for libssl0.9.8/restart-services
    depending on whether a desktop, or server dist-upgrade is being
    performed.
  - Display a system restart required notification bubble on libssl0.9.8
    upgrade.
  - Replace duplicate files in the doc directory with symlinks.
  - Move runtime libraries to /lib, for the benefit of wpasupplicant
* Strip the patches out of the source into quilt patches
* Disable CVE-2009-3555.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/e_aep.c
65
65
typedef int pid_t;
66
66
#endif
67
67
 
 
68
#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
 
69
#define getpid GetThreadID
 
70
extern int GetThreadID(void);
 
71
#endif
 
72
 
68
73
#include <openssl/crypto.h>
69
74
#include <openssl/dso.h>
70
75
#include <openssl/engine.h>
862
867
 
863
868
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
864
869
 
865
 
#ifndef NETWARE_CLIB
 
870
#ifdef NETWARE_CLIB
 
871
        curr_pid = GetThreadID();
 
872
#elif defined(_WIN32)
 
873
        curr_pid = _getpid();
 
874
#else
866
875
        curr_pid = getpid();
867
 
#else
868
 
        curr_pid = GetThreadID();
869
876
#endif
870
877
 
871
878
        /*Check if this is the first time this is being called from the current