| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 var internalAPI = require('platformKeys.internalAPI'); | 5 var internalAPI = require('platformKeys.internalAPI'); |
| 6 | 6 |
| 7 var normalizeAlgorithm = | 7 var normalizeAlgorithm = |
| 8 requireNative('platform_keys_natives').NormalizeAlgorithm; | 8 requireNative('platform_keys_natives').NormalizeAlgorithm; |
| 9 | 9 |
| 10 function normalizeImportParams(importParams) { | 10 function normalizeImportParams(importParams) { |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 if (algorithm.publicExponent) { | 40 if (algorithm.publicExponent) { |
| 41 algorithm.publicExponent = new Uint8Array(algorithm.publicExponent); | 41 algorithm.publicExponent = new Uint8Array(algorithm.publicExponent); |
| 42 } | 42 } |
| 43 | 43 |
| 44 algorithm.hash = importParams.hash; | 44 algorithm.hash = importParams.hash; |
| 45 return algorithm; | 45 return algorithm; |
| 46 } | 46 } |
| 47 | 47 |
| 48 function getPublicKey(cert, importParams, callback) { | 48 function getPublicKey(cert, importParams, callback) { |
| 49 importParams = normalizeImportParams(importParams); | 49 importParams = normalizeImportParams(importParams); |
| 50 // TODO(pneubeck): pass importParams.name to the internal getPublicKey and | 50 internalAPI.getPublicKey( |
| 51 // verify on the C++ side that the requested algorithm is compatible with the | 51 cert, importParams.name, function(publicKey, algorithm) { |
| 52 // given SubjectPublicKeyInfo of the certificate. | 52 if (chrome.runtime.lastError) { |
| 53 // https://crbug.com/466584 | 53 callback(); |
| 54 internalAPI.getPublicKey(cert, function(publicKey, algorithm) { | 54 return; |
| 55 var combinedAlgorithm = combineAlgorithms(algorithm, importParams); | 55 } |
| 56 callback(publicKey, combinedAlgorithm); | 56 var combinedAlgorithm = combineAlgorithms(algorithm, importParams); |
| 57 }); | 57 callback(publicKey, combinedAlgorithm); |
| 58 }); |
| 58 } | 59 } |
| 59 | 60 |
| 60 exports.getPublicKey = getPublicKey; | 61 exports.getPublicKey = getPublicKey; |
| OLD | NEW |