| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "net/cert/jwk_serializer.h" | 5 #include "net/cert/jwk_serializer.h" |
| 6 | 6 |
| 7 #include <cert.h> | 7 #include <cert.h> |
| 8 #include <keyhi.h> | 8 #include <keyhi.h> |
| 9 #include <nss.h> | 9 #include <nss.h> |
| 10 | 10 |
| 11 #include "base/base64url.h" | 11 #include "base/base64url.h" |
| 12 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/values.h" | 13 #include "base/values.h" |
| 13 #include "crypto/nss_util.h" | 14 #include "crypto/nss_util.h" |
| 14 #include "crypto/scoped_nss_types.h" | 15 #include "crypto/scoped_nss_types.h" |
| 15 | 16 |
| 16 namespace net { | 17 namespace net { |
| 17 | 18 |
| 18 namespace JwkSerializer { | 19 namespace JwkSerializer { |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| 21 | 22 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 sizeof(kIdEcPublicKey))) { | 110 sizeof(kIdEcPublicKey))) { |
| 110 rv = ConvertEcPublicKeyInfoToJwk(spki.get(), public_key_jwk); | 111 rv = ConvertEcPublicKeyInfoToJwk(spki.get(), public_key_jwk); |
| 111 } | 112 } |
| 112 // TODO(juanlang): other algorithms | 113 // TODO(juanlang): other algorithms |
| 113 return rv; | 114 return rv; |
| 114 } | 115 } |
| 115 | 116 |
| 116 } // namespace JwkSerializer | 117 } // namespace JwkSerializer |
| 117 | 118 |
| 118 } // namespace net | 119 } // namespace net |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1870233002:
Convert crypto to std::unique_ptr (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master