Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tls: Add publicKey to certificate information #1725

Closed
wants to merge 1 commit into from
Closed

tls: Add publicKey to certificate information #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/api/tls.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,8 @@ Example:
valid_from: 'Nov 11 09:52:22 2009 GMT',
valid_to: 'Nov 6 09:52:22 2029 GMT',
fingerprint: '2A:7A:C2:DD:E5:F9:CC:53:72:35:99:7A:02:5A:71:38:52:EC:8A:DF',
serialNumber: 'B9B0D332A1AA5635' }
serialNumber: 'B9B0D332A1AA5635',
subjectPublicKeyInfo: < SPKI DER buffer > }

If the peer does not provide a certificate, it returns `null` or an empty
object.
Expand Down
1 change: 1 addition & 0 deletions src/env.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ namespace node {
V(status_string, "status") \
V(stdio_string, "stdio") \
V(subject_string, "subject") \
V(subject_public_key_info_string, "subjectPublicKeyInfo") \
V(subjectaltname_string, "subjectaltname") \
V(sys_string, "sys") \
V(syscall_string, "syscall") \
Expand Down
10 changes: 9 additions & 1 deletion src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,9 +1217,17 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {

EVP_PKEY* pkey = X509_get_pubkey(cert);
RSA* rsa = nullptr;
if (pkey != nullptr)
if (pkey != nullptr) {
rsa = EVP_PKEY_get1_RSA(pkey);

int pkey_size = i2d_PUBKEY(pkey, nullptr);
Local<Object> pkey_buff = Buffer::New(env, pkey_size);
unsigned char* pkey_serialized = reinterpret_cast<unsigned char*>(
Buffer::Data(pkey_buff));
i2d_PUBKEY(pkey, &pkey_serialized);
info->Set(env->subject_public_key_info_string(), pkey_buff);
}

if (rsa != nullptr) {
BN_print(bio, rsa->n);
BIO_get_mem_ptr(bio, &mem);
Expand Down
7 changes: 7 additions & 0 deletions test/parallel/test-tls-peer-certificate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ var options = {
};
var verified = false;

var expectedBase64SubjectPublicKeyInfo = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB' +
'iQKBgQC46zeFbysX7vHHmIH3COYiB34dOpEVR4rEb6ZZXfkeXoDe7NgZfBbOeqw6iavhr' +
'9SRmvFs8ankDCpr2DvY0X3uDdLKyrYNbhrfJxdYB5hhwdKVHGokZdOPH68b/ScMJcsGGg' +
'Mo7TTMRxx2MZLzESOOJ5BCv4p4BKYibSRCa43lhwIDAQAB';

var server = tls.createServer(options, function(cleartext) {
cleartext.end('World');
});
Expand All @@ -37,6 +42,8 @@ server.listen(common.PORT, function() {
common.debug(util.inspect(peerCert));
assert.equal(peerCert.subject.emailAddress, '[email protected]');
assert.equal(peerCert.serialNumber, '9A84ABCFB8A72AC0');
assert.equal(peerCert.subjectPublicKeyInfo.toString('base64'),
expectedBase64SubjectPublicKeyInfo);
assert.deepEqual(peerCert.infoAccess['OCSP - URI'],
[ 'http://ocsp.nodejs.org/' ]);

Expand Down