← Back to branch summary

~ubuntu-branches/ubuntu/natty/ruby1.8/natty-updates

« back to all changes in this revision

Viewing changes to ext/openssl/openssl_missing.h

  • Committer: Package Import Robot
  • Author(s): Daigo Moriwaki
  • Date: 2010-06-27 22:16:44 UTC
  • mfrom: (22.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20100627221644-7n8891uzqc17nvyq
Tags: 1.8.7.299-1
* New upstream release
* Removed patches that the upstrem has applied:
  - debian/patches/100312_timeout-fix.dpatch
  - debian/patches/100620_fix_pathname_warning.dpatch
  - debian/patches/100620_fix_super_called_outside_of_method.dpatch

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/openssl/openssl_missing.h
1
1
/*
2
 
 * $Id: openssl_missing.h 18335 2008-08-04 04:44:17Z shyouhei $
 
2
 * $Id: openssl_missing.h 28004 2010-05-24 23:58:49Z shyouhei $
3
3
 * 'OpenSSL for Ruby' project
4
4
 * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
5
5
 * All rights reserved.
18
18
#ifndef TYPEDEF_D2I_OF
19
19
typedef char *d2i_of_void();
20
20
#endif
 
21
#ifndef TYPEDEF_I2D_OF
 
22
typedef int i2d_of_void();
 
23
#endif
21
24
 
22
25
/*
23
26
 * These functions are not included in headers of OPENSSL <= 0.9.6b
30
33
 
31
34
#if !defined(PEM_write_bio_DSAPublicKey)
32
35
# define PEM_write_bio_DSAPublicKey(bp,x) \
33
 
        PEM_ASN1_write_bio((int (*)())i2d_DSAPublicKey,\
 
36
        PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPublicKey,\
34
37
                PEM_STRING_DSA_PUBLIC,\
35
38
                bp,(char *)x, NULL, NULL, 0, NULL, NULL)
36
39
#endif
37
40
 
38
41
#if !defined(DSAPrivateKey_dup)
39
 
# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
 
42
# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, \
40
43
        (char *(*)())d2i_DSAPrivateKey,(char *)dsa)
41
44
#endif
42
45
 
43
46
#if !defined(DSAPublicKey_dup)
44
 
# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
 
47
# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
45
48
        (char *(*)())d2i_DSAPublicKey,(char *)dsa)
46
49
#endif
47
50
 
48
51
#if !defined(X509_REVOKED_dup)
49
 
# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 
52
# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
50
53
        (char *(*)())d2i_X509_REVOKED, (char *)rev)
51
54
#endif
52
55
 
53
56
#if !defined(PKCS7_SIGNER_INFO_dup)
54
 
#  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \
 
57
#  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_SIGNER_INFO, \
55
58
        (char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
56
59
#endif
57
60
 
58
61
#if !defined(PKCS7_RECIP_INFO_dup)
59
 
#  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \
 
62
#  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_RECIP_INFO, \
60
63
        (char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
61
64
#endif
62
65