diff options
| author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-11 22:27:14 +0000 |
|---|---|---|
| committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-11 22:27:14 +0000 |
| commit | bc75259b69e3ba6cddea7e8508b90ea7759a6923 (patch) | |
| tree | 29c576880455ca5edd97cae22225cba8c3936244 /ext/openssl | |
| parent | adaab0f922c992843efb4ea52e47b45b4fc35ffd (diff) | |
Thu May 12 08:18:45 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
format for PEM-encoding DSA public keys.
[ruby-core:35328] [Bug #4422]
Previous revision: 31520
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl_pkey_dsa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c index 976e15eeef..3a46866cd7 100644 --- a/ext/openssl/ossl_pkey_dsa.c +++ b/ext/openssl/ossl_pkey_dsa.c @@ -163,22 +163,22 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self) if (!dsa) { (void)BIO_reset(in); (void)ERR_get_error(); - dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL); + dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL); } if (!dsa) { (void)BIO_reset(in); (void)ERR_get_error(); - dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL); + dsa = d2i_DSAPrivateKey_bio(in, NULL); } if (!dsa) { (void)BIO_reset(in); (void)ERR_get_error(); - dsa = d2i_DSAPrivateKey_bio(in, NULL); + dsa = d2i_DSA_PUBKEY_bio(in, NULL); } if (!dsa) { (void)BIO_reset(in); (void)ERR_get_error(); - dsa = d2i_DSA_PUBKEY_bio(in, NULL); + dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL); } BIO_free(in); if (!dsa) { @@ -264,7 +264,7 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self) ossl_raise(eDSAError, NULL); } } else { - if (!PEM_write_bio_DSAPublicKey(out, pkey->pkey.dsa)) { + if (!PEM_write_bio_DSA_PUBKEY(out, pkey->pkey.dsa)) { BIO_free(out); ossl_raise(eDSAError, NULL); } |