diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2020-02-17 18:30:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 18:30:54 +0900 |
| commit | 19ef481efbf77fed265778364ac3886db7dba556 (patch) | |
| tree | 2f0869b9215933190743cf5eac668744958c0962 | |
| parent | 32dea72bd213f51701f762aeb7287a7813264783 (diff) | |
| parent | 890a6476fa2493227ec0517c6f8b444da9415e49 (diff) | |
| download | ruby-openssl-19ef481efbf77fed265778364ac3886db7dba556.tar.gz | |
Merge pull request #339 from rhenium/ky/ts-simplify-tsreq-get-algorithm
ts: simplify OpenSSL::Timestamp::Request#algorithm
| -rw-r--r-- | ext/openssl/ossl_ts.c | 7 | ||||
| -rw-r--r-- | test/openssl/test_ts.rb | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/ext/openssl/ossl_ts.c b/ext/openssl/ossl_ts.c index 24f5289c..ba0df750 100644 --- a/ext/openssl/ossl_ts.c +++ b/ext/openssl/ossl_ts.c @@ -217,7 +217,7 @@ ossl_ts_req_initialize(int argc, VALUE *argv, VALUE self) * algorithm that was used to create the message imprint digest. * * call-seq: - * request.get_algorithm -> string or nil + * request.algorithm -> string */ static VALUE ossl_ts_req_get_algorithm(VALUE self) @@ -225,15 +225,10 @@ ossl_ts_req_get_algorithm(VALUE self) TS_REQ *req; TS_MSG_IMPRINT *mi; X509_ALGOR *algor; - int algi; GetTSRequest(self, req); mi = TS_REQ_get_msg_imprint(req); algor = TS_MSG_IMPRINT_get_algo(mi); - algi = OBJ_obj2nid(algor->algorithm); - if (algi == NID_undef || algi == NID_ccitt) - return Qnil; - return get_asn1obj(algor->algorithm); } diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb index c57f08cf..1fa4a7cf 100644 --- a/test/openssl/test_ts.rb +++ b/test/openssl/test_ts.rb @@ -67,16 +67,6 @@ _end_of_pem_ @ts_cert_ee ||= OpenSSL::Certs.ts_cert_ee(ee_key, intermediate_cert, intermediate_key) end - def test_create_request - req = OpenSSL::Timestamp::Request.new - assert_equal(true, req.cert_requested?) - assert_equal(1, req.version) - assert_nil(req.algorithm) - assert_equal("", req.message_imprint) - assert_nil(req.policy_id) - assert_nil(req.nonce) - end - def test_request_mandatory_fields req = OpenSSL::Timestamp::Request.new assert_raise(OpenSSL::Timestamp::TimestampError) do |