← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to ext/openssl/ossl_pkcs5.c

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/openssl/ossl_pkcs5.c
7
7
VALUE mPKCS5;
8
8
VALUE ePKCS5;
9
9
 
 
10
#ifdef HAVE_PKCS5_PBKDF2_HMAC
10
11
/*
11
12
 * call-seq:
12
13
 *    PKCS5.pbkdf2_hmac(pass, salt, iter, keylen, digest) => string
25
26
static VALUE
26
27
ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen, VALUE digest)
27
28
{
28
 
#ifdef HAVE_PKCS5_PBKDF2_HMAC
29
29
    VALUE str;
30
30
    const EVP_MD *md;
31
31
    int len = NUM2INT(keylen);
40
40
        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
41
41
 
42
42
    return str;
 
43
}
43
44
#else
44
 
    rb_notimplement();
 
45
#define ossl_pkcs5_pbkdf2_hmac rb_f_notimplement
45
46
#endif
46
 
}
47
 
 
48
 
 
 
47
 
 
48
 
 
49
#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
49
50
/*
50
51
 * call-seq:
51
52
 *    PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
63
64
static VALUE
64
65
ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
65
66
{
66
 
#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
67
67
    VALUE str;
68
68
    int len = NUM2INT(keylen);
69
69
 
78
78
        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
79
79
 
80
80
    return str;
 
81
}
81
82
#else
82
 
    rb_notimplement();
 
83
#define ossl_pkcs5_pbkdf2_hmac_sha1 rb_f_notimplement
83
84
#endif
84
 
}
85
85
 
86
86
void
87
87
Init_ossl_pkcs5()