← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to engines/e_aep.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2011-04-02 13:19:19 UTC
  • mfrom: (1.2.1 upstream) (11.2.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: james.westby@ubuntu.com-20110402131919-anszuslper64ey9e
Tags: 1.0.0d-1
http://bugs.debian.org/607609
* New upstream version
  - Fixes CVE-2011-0014
* Make libssl-doc Replaces/Breaks with old libssl-dev packages
  (Closes: #607609)
* Only export the symbols we should, instead of all.
* Add symbol file.
* Upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/e_aep.c
57
57
#include <string.h>
58
58
 
59
59
#include <openssl/e_os2.h>
60
 
#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
 
60
#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) || defined(__MINGW32__)
61
61
#include <sys/types.h>
62
62
#include <unistd.h>
63
63
#else
68
68
#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
69
69
#define getpid GetThreadID
70
70
extern int GetThreadID(void);
 
71
#elif defined(_WIN32) && !defined(__WATCOMC__)
 
72
#define getpid _getpid
71
73
#endif
72
74
 
73
75
#include <openssl/crypto.h>
867
869
 
868
870
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
869
871
 
870
 
#ifdef NETWARE_CLIB
871
 
        curr_pid = GetThreadID();
872
 
#elif defined(_WIN32)
873
 
        curr_pid = _getpid();
874
 
#else
875
872
        curr_pid = getpid();
876
 
#endif
877
873
 
878
874
        /*Check if this is the first time this is being called from the current
879
875
          process*/