@@ -26,12 +26,17 @@ use ccm::{
26
26
use elliptic_curve:: sec1:: { FromEncodedPoint , ToEncodedPoint } ;
27
27
use hmac:: Mac ;
28
28
use log:: error;
29
- use p256:: { ecdsa:: { SigningKey , VerifyingKey , Signature } , SecretKey , PublicKey , EncodedPoint , AffinePoint } ;
29
+ use p256:: {
30
+ ecdsa:: { Signature , SigningKey , VerifyingKey } ,
31
+ AffinePoint , EncodedPoint , PublicKey , SecretKey ,
32
+ } ;
30
33
use sha2:: Digest ;
31
34
use x509_cert:: {
32
35
attr:: AttributeType ,
33
36
der:: { asn1:: BitString , Any , Encode } ,
34
- spki:: { AlgorithmIdentifier , SubjectPublicKeyInfoOwned } , name:: RdnSequence , request:: CertReq ,
37
+ name:: RdnSequence ,
38
+ request:: CertReq ,
39
+ spki:: { AlgorithmIdentifier , SubjectPublicKeyInfoOwned } ,
35
40
} ;
36
41
37
42
use crate :: error:: Error ;
@@ -159,20 +164,19 @@ impl CryptoKeyPair for KeyPair {
159
164
fn get_csr < ' a > ( & self , out_csr : & ' a mut [ u8 ] ) -> Result < & ' a [ u8 ] , Error > {
160
165
use p256:: ecdsa:: signature:: Signer ;
161
166
162
- let subject =
163
- RdnSequence ( vec ! [ x509_cert:: name:: RelativeDistinguishedName (
164
- vec![ x509_cert:: attr:: AttributeTypeAndValue {
165
- // Organization name: http://www.oid-info.com/get/2.5.4.10
166
- oid: x509_cert:: attr:: AttributeType :: new_unwrap( "2.5.4.10" ) ,
167
- value: x509_cert:: attr:: AttributeValue :: new(
168
- x509_cert:: der:: Tag :: Utf8String ,
169
- "CSR" . as_bytes( ) ,
170
- )
171
- . unwrap( ) ,
172
- } ]
173
- . try_into( )
167
+ let subject = RdnSequence ( vec ! [ x509_cert:: name:: RelativeDistinguishedName (
168
+ vec![ x509_cert:: attr:: AttributeTypeAndValue {
169
+ // Organization name: http://www.oid-info.com/get/2.5.4.10
170
+ oid: x509_cert:: attr:: AttributeType :: new_unwrap( "2.5.4.10" ) ,
171
+ value: x509_cert:: attr:: AttributeValue :: new(
172
+ x509_cert:: der:: Tag :: Utf8String ,
173
+ "CSR" . as_bytes( ) ,
174
+ )
174
175
. unwrap( ) ,
175
- ) ] ) ;
176
+ } ]
177
+ . try_into( )
178
+ . unwrap( ) ,
179
+ ) ] ) ;
176
180
let mut pubkey = [ 0 ; 65 ] ;
177
181
self . get_public_key ( & mut pubkey) . unwrap ( ) ;
178
182
let info = x509_cert:: request:: CertReqInfo {
0 commit comments