From: IWATSUKI Hiroyuki Date: 2005-03-12T20:46:40+09:00 Subject: [ruby-dev:25867] ext/openssl/ossl_{pkey_dh,ssl}.c This is a multi-part message in MIME format. --------------060104060308020107050307 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit 岩月と申します。 Ruby 1.9のmakeでエラーが出ましたので、添付ファイルにありますように修正し ました。コードの内容を理解しないままとりあえずコンパイルできるようにした だけですので、ご確認をよろしくお願いいたします。 -- Hiroyuki Iwatsuki --------------060104060308020107050307 Content-Type: text/plain; name="20050312-ruby19_diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="20050312-ruby19_diff" SW5kZXg6IGV4dC9vcGVuc3NsL29zc2xfcGtleV9kaC5jDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg ZmlsZTogL2hvbWUvZG9uL3J1YnkvY3ZzL3NyYy9ydWJ5L2V4dC9vcGVuc3NsL29zc2xfcGtl eV9kaC5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS43DQpkaWZmIC11IC1wIC1yMS43IG9z c2xfcGtleV9kaC5jDQotLS0gZXh0L29wZW5zc2wvb3NzbF9wa2V5X2RoLmMJOSBNYXIgMjAw NSAxMDo0NTo0MSAtMDAwMAkxLjcNCisrKyBleHQvb3BlbnNzbC9vc3NsX3BrZXlfZGguYwkx MSBNYXIgMjAwNSAyMjo1NDoyNSAtMDAwMA0KQEAgLTQwMSwxMiArNDAxLDEyIEBAIG9zc2xf Y3JlYXRlX2RoKHVuc2lnbmVkIGNoYXIgKnAsIHNpemVfdCANCiB7DQogICAgIERIICpkaDsN CiANCi0gICAgaWYgKChkaCA9IERIX25ldygpKSA9PSBOVUxMKSBvc3NsX2lyYXNlKGVESEVy cm9yLCBOVUxMKTsNCisgICAgaWYgKChkaCA9IERIX25ldygpKSA9PSBOVUxMKSBvc3NsX3Jh aXNlKGVESEVycm9yLCBOVUxMKTsNCiAgICAgZGgtPnAgPSBCTl9iaW4yYm4ocCwgcGxlbiwg TlVMTCk7DQogICAgIGRoLT5nID0gQk5fYmluMmJuKGcsIGdsZW4sIE5VTEwpOw0KICAgICBp ZiAoZGgtPnAgPT0gTlVMTCB8fCBkaC0+ZyA9PSBOVUxMKXsNCiAgICAgICAgIERIX2ZyZWUo ZGgpOw0KLQlvc3NsX2lyYXNlKGVESEVycm9yLCBOVUxMKTsNCisJb3NzbF9yYWlzZShlREhF cnJvciwgTlVMTCk7DQogICAgIH0NCiANCiAgICAgcmV0dXJuIGRoOw0KSW5kZXg6IGV4dC9v cGVuc3NsL29zc2xfc3NsLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9kb24v cnVieS9jdnMvc3JjL3J1YnkvZXh0L29wZW5zc2wvb3NzbF9zc2wuYyx2DQpyZXRyaWV2aW5n IHJldmlzaW9uIDEuMjMNCmRpZmYgLXUgLXAgLXIxLjIzIG9zc2xfc3NsLmMNCi0tLSBleHQv b3BlbnNzbC9vc3NsX3NzbC5jCTkgTWFyIDIwMDUgMTA6NDU6NDEgLTAwMDAJMS4yMw0KKysr IGV4dC9vcGVuc3NsL29zc2xfc3NsLmMJMTEgTWFyIDIwMDUgMjI6NTY6NDcgLTAwMDANCkBA IC0yMjMsNyArMjIzLDcgQEAgb3NzbF9jYWxsX3RtcF9kaF9jYWxsYmFjayhWQUxVRSAqYXJn cykNCiAgICAgZGggPSByYl9mdW5jYWxsKGNiLCByYl9pbnRlcm4oImNhbGwiKSwgMywgYXJn c1swXSwgYXJnc1sxXSwgYXJnc1syXSk7DQogICAgIHBrZXkgPSBHZXRQS2V5UHRyKGRoKTsN CiAgICAgaWYgKEVWUF9QS0VZX3R5cGUocGtleS0+dHlwZSkgIT0gRVZQX1BLRVlfREgpIHJl dHVybiBRZmFsc2U7DQotICAgIG9zc2xfc3NsX3NldF90bXBfZGhfa2V5KGFyZ3NbMF0sIGRo KTsNCisgICAgb3NzbF9zc2xfc2V0X3RtcF9kaChhcmdzWzBdLCBkaCk7DQogDQogICAgIHJl dHVybiBRdHJ1ZTsNCiB9DQpAQCAtMjQxLDcgKzI0MSw3IEBAIG9zc2xfdG1wX2RoX2NhbGxi YWNrKFNTTCAqc3NsLCBpbnQgaXNfZXgNCiAgICAgICAgICAgICAgICAgICAgICAgICAgKFZB TFVFKWFyZ3MsICZzdGF0dXMpOw0KICAgICBpZiAoc3RhdHVzIHx8ICFzdWNjZXNzKSByZXR1 cm4gTlVMTDsNCiANCi0gICAgcmV0dXJuIEdldFBLZXlQdHIob3NzbF9zc2xfZ2V0X2RoKG9i aikpLT5wa2V5LmRoOw0KKyAgICByZXR1cm4gR2V0UEtleVB0cihvc3NsX3NzbF9nZXRfdG1w X2RoKG9iaikpLT5wa2V5LmRoOw0KIH0NCiANCiBzdGF0aWMgREgqDQo= --------------060104060308020107050307--