@@ -106,20 +106,20 @@ def _sig_component_length(self):
106106 """
107107 return math .ceil (self .prepared_key .key_size / 8.0 )
108108
109- def _der_to_asn1 (self , der_signature ):
110- """Convert signature from DER encoding to ASN1 encoding."""
109+ def _der_to_raw (self , der_signature ):
110+ """Convert signature from DER encoding to RAW encoding."""
111111 r , s = decode_dss_signature (der_signature )
112112 component_length = self ._sig_component_length ()
113113 return int_to_bytes (r , component_length ) + int_to_bytes (s , component_length )
114114
115- def _asn1_to_der (self , asn1_signature ):
116- """Convert signature from ASN1 encoding to DER encoding."""
115+ def _raw_to_der (self , raw_signature ):
116+ """Convert signature from RAW encoding to DER encoding."""
117117 component_length = self ._sig_component_length ()
118- if len (asn1_signature ) != int (2 * component_length ):
118+ if len (raw_signature ) != int (2 * component_length ):
119119 raise ValueError ("Invalid signature" )
120120
121- r_bytes = asn1_signature [:component_length ]
122- s_bytes = asn1_signature [component_length :]
121+ r_bytes = raw_signature [:component_length ]
122+ s_bytes = raw_signature [component_length :]
123123 r = int_from_bytes (r_bytes , "big" )
124124 s = int_from_bytes (s_bytes , "big" )
125125 return encode_dss_signature (r , s )
@@ -130,11 +130,11 @@ def sign(self, msg):
130130 "for your digest (%d)" % (self .prepared_key .curve .name ,
131131 8 * self .hash_alg .digest_size ))
132132 signature = self .prepared_key .sign (msg , ec .ECDSA (self .hash_alg ()))
133- return self ._der_to_asn1 (signature )
133+ return self ._der_to_raw (signature )
134134
135135 def verify (self , msg , sig ):
136136 try :
137- signature = self ._asn1_to_der (sig )
137+ signature = self ._raw_to_der (sig )
138138 self .prepared_key .verify (signature , msg , ec .ECDSA (self .hash_alg ()))
139139 return True
140140 except Exception :
0 commit comments