From bc75259b69e3ba6cddea7e8508b90ea7759a6923 Mon Sep 17 00:00:00 2001 From: emboss Date: Wed, 11 May 2011 22:27:14 +0000 Subject: Thu May 12 08:18:45 2011 Martin Bosslet * 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 --- ext/openssl/ossl_pkey_dsa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/openssl') 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); } -- cgit v1.2.3