Browse Source

Added additional properties to getPeerCertificate, now includes subjectAltName, Exponent and Modulus (FOAF+SSL friendly).

Patch written by Nathan,
http://groups.google.com/group/nodejs/browse_thread/thread/1d42da4cb2e51536
Niclas Hoyer 14 years ago
committed by koichik
parent
commit
7b2536a1a2
  1. 46
      src/node_crypto.cc
  2. 1
      src/node_crypto.h

46
src/node_crypto.cc

@ -63,6 +63,9 @@ using namespace v8;
static Persistent<String> errno_symbol; static Persistent<String> errno_symbol;
static Persistent<String> syscall_symbol; static Persistent<String> syscall_symbol;
static Persistent<String> subject_symbol; static Persistent<String> subject_symbol;
static Persistent<String> subjectaltname_symbol;
static Persistent<String> modulus_symbol;
static Persistent<String> exponent_symbol;
static Persistent<String> issuer_symbol; static Persistent<String> issuer_symbol;
static Persistent<String> valid_from_symbol; static Persistent<String> valid_from_symbol;
static Persistent<String> valid_to_symbol; static Persistent<String> valid_to_symbol;
@ -1087,6 +1090,46 @@ Handle<Value> Connection::GetPeerCertificate(const Arguments& args) {
} }
(void) BIO_reset(bio); (void) BIO_reset(bio);
char buf[256];
bio = NULL;
ASN1_OBJECT *oid;
oid = OBJ_txt2obj("2.5.29.17", 1); // OID 2.5.29.17 is Subject AltName
int count = 0, j;
count = X509_get_ext_count(peer_cert);
for (j = 0; j < count; j++) {
X509_EXTENSION *ext = X509_get_ext(peer_cert, j);
if (OBJ_cmp(ext->object, oid) == 0) {
bio = BIO_new(BIO_s_mem());
if (X509V3_EXT_print(bio, ext, 0, 0) == 1) {
memset(buf, 0, sizeof(buf));
BIO_read(bio, buf, sizeof(buf) - 1);
info->Set(subjectaltname_symbol, String::New(buf));
}
BIO_vfree(bio);
break;
}
}
EVP_PKEY *pkey = NULL;
RSA *rsa = NULL;
if( NULL != (pkey = X509_get_pubkey(peer_cert))
&& NULL != (rsa = EVP_PKEY_get1_RSA(pkey)) ) {
bio = BIO_new(BIO_s_mem());
BN_print(bio, rsa->n);
memset(buf, 0, sizeof(buf));
BIO_read(bio, buf, sizeof(buf) - 1);
info->Set(modulus_symbol, String::New(buf) );
BIO_free(bio);
bio = BIO_new(BIO_s_mem());
BN_print(bio, rsa->e);
memset(buf, 0, sizeof(buf));
BIO_read(bio, buf, sizeof(buf) - 1);
info->Set(exponent_symbol, String::New(buf) );
BIO_free(bio);
}
(void) BIO_reset(bio);
ASN1_TIME_print(bio, X509_get_notBefore(peer_cert)); ASN1_TIME_print(bio, X509_get_notBefore(peer_cert));
BIO_get_mem_ptr(bio, &mem); BIO_get_mem_ptr(bio, &mem);
info->Set(valid_from_symbol, String::New(mem->data, mem->length)); info->Set(valid_from_symbol, String::New(mem->data, mem->length));
@ -3922,6 +3965,9 @@ void InitCrypto(Handle<Object> target) {
issuer_symbol = NODE_PSYMBOL("issuer"); issuer_symbol = NODE_PSYMBOL("issuer");
valid_from_symbol = NODE_PSYMBOL("valid_from"); valid_from_symbol = NODE_PSYMBOL("valid_from");
valid_to_symbol = NODE_PSYMBOL("valid_to"); valid_to_symbol = NODE_PSYMBOL("valid_to");
subjectaltname_symbol = NODE_PSYMBOL("subjectaltname");
modulus_symbol = NODE_PSYMBOL("modulus");
exponent_symbol = NODE_PSYMBOL("exponent");
fingerprint_symbol = NODE_PSYMBOL("fingerprint"); fingerprint_symbol = NODE_PSYMBOL("fingerprint");
name_symbol = NODE_PSYMBOL("name"); name_symbol = NODE_PSYMBOL("name");
version_symbol = NODE_PSYMBOL("version"); version_symbol = NODE_PSYMBOL("version");

1
src/node_crypto.h

@ -32,6 +32,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#ifdef OPENSSL_NPN_NEGOTIATED #ifdef OPENSSL_NPN_NEGOTIATED

Loading…
Cancel
Save