rhe	2016-06-14 21:35:28 +0900 (Tue, 14 Jun 2016)

  New Revision: 55408

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55408

  Log:
    openssl: fix acesssor functions for RSA and DH in openssl_missing.h
    
    * ext/openssl/openssl_missing.h (DH_set0_pqg, RSA_set0_key):
      DH_set0_pqg() allows 'q' to be NULL. Fix a typo in RSA_set0_key().
      Fixes r55285.  [ruby-core:75225] [Feature #12324]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/openssl_missing.h
Index: ext/openssl/openssl_missing.h
===================================================================
--- ext/openssl/openssl_missing.h	(revision 55407)
+++ ext/openssl/openssl_missing.h	(revision 55408)
@@ -201,7 +201,7 @@ static inline int _type##_set0_##_group( https://github.com/ruby/ruby/blob/trunk/ext/openssl/openssl_missing.h#L201
 
 #if !defined(OPENSSL_NO_RSA)
 IMPL_PKEY_GETTER(RSA, rsa)
-IMPL_KEY_ACCESSOR3(RSA, key, n, e, d, (n == obj->n || e == obj->e || (obj->d && e == obj->d)))
+IMPL_KEY_ACCESSOR3(RSA, key, n, e, d, (n == obj->n || e == obj->e || (obj->d && d == obj->d)))
 IMPL_KEY_ACCESSOR2(RSA, factors, p, q, (p == obj->p || q == obj->q))
 IMPL_KEY_ACCESSOR3(RSA, crt_params, dmp1, dmq1, iqmp, (dmp1 == obj->dmp1 || dmq1 == obj->dmq1 || iqmp == obj->iqmp))
 #endif
@@ -215,7 +215,7 @@ IMPL_KEY_ACCESSOR3(DSA, pqg, p, q, g, (p https://github.com/ruby/ruby/blob/trunk/ext/openssl/openssl_missing.h#L215
 #if !defined(OPENSSL_NO_DH)
 IMPL_PKEY_GETTER(DH, dh)
 IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
-IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || q == obj->q || g == obj->g))
+IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || obj->q && q == obj->q || g == obj->g))
 static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; }
 #endif
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55407)
+++ ChangeLog	(revision 55408)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jun 14 21:35:00 2016  Kazuki Yamaguchi  <k@r...>
+
+	* ext/openssl/openssl_missing.h (DH_set0_pqg, RSA_set0_key):
+	  DH_set0_pqg() allows 'q' to be NULL. Fix a typo in RSA_set0_key().
+	  Fixes r55285.  [ruby-core:75225] [Feature #12324]
+
 Mon Jun 14 10:19:00 2016  Kenta Murata  <mrkn@m...>
 
 	* NEWS: describe Integer#digits.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/