diff options
| author | Greg Hughes <greg@ghughes.com> | 2011-01-28 00:12:13 +0000 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-01-27 16:16:22 -0800 |
| commit | 1a5e5130843b5eca79fce60a6c032f3d7ac61017 (patch) | |
| tree | 8b4c817ddeccf3be3cb80bb7a3d6bc8a2b653f4d | |
| parent | 4ea6916974ba9a911ee521e4fd60adbc1e0e8f97 (diff) | |
| download | node-new-1a5e5130843b5eca79fce60a6c032f3d7ac61017.tar.gz | |
Fix style issues with ext_key_usage patch
Closes GH-586.
| -rw-r--r-- | src/node_crypto.cc | 9 | ||||
| -rw-r--r-- | test/simple/test-tls-ext-key-usage.js | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 54ccdabf14..37e28690d7 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -696,17 +696,18 @@ Handle<Value> Connection::GetPeerCertificate(const Arguments& args) { info->Set(fingerprint_symbol, String::New(fingerprint)); } - - STACK_OF(ASN1_OBJECT) *eku = (STACK_OF(ASN1_OBJECT) *)X509_get_ext_d2i(peer_cert, NID_ext_key_usage, NULL, NULL); + + STACK_OF(ASN1_OBJECT) *eku = (STACK_OF(ASN1_OBJECT) *)X509_get_ext_d2i( + peer_cert, NID_ext_key_usage, NULL, NULL); if (eku != NULL) { Local<Array> ext_key_usage = Array::New(); - + for (int i = 0; i < sk_ASN1_OBJECT_num(eku); i++) { memset(buf, 0, sizeof(buf)); OBJ_obj2txt(buf, sizeof(buf) - 1, sk_ASN1_OBJECT_value(eku, i), 1); ext_key_usage->Set(Integer::New(i), String::New(buf)); } - + sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free); info->Set(ext_key_usage_symbol, ext_key_usage); } diff --git a/test/simple/test-tls-ext-key-usage.js b/test/simple/test-tls-ext-key-usage.js index da78868c22..75c376f4f2 100644 --- a/test/simple/test-tls-ext-key-usage.js +++ b/test/simple/test-tls-ext-key-usage.js @@ -110,11 +110,11 @@ function startClient() { console.log('client: connected+secure!'); console.log('client pair.cleartext.getPeerCertificate(): %j', pair.cleartext.getPeerCertificate()); - + // "TLS Web Client Authentication" - assert.equal(pair.cleartext.getPeerCertificate().ext_key_usage.length, 1) - assert.equal(pair.cleartext.getPeerCertificate().ext_key_usage[0], '1.3.6.1.5.5.7.3.2') - + assert.equal(pair.cleartext.getPeerCertificate().ext_key_usage.length, 1); + assert.equal(pair.cleartext.getPeerCertificate().ext_key_usage[0], '1.3.6.1.5.5.7.3.2'); + console.log('client pair.cleartext.getCipher(): %j', pair.cleartext.getCipher()); setTimeout(function() { |