openstack
/
anchor
Code Issues Proposed changes

Merge "Use hex strings instead of messing with bits"

This commit is contained in:
Jenkins 2015-11-04 16:28:11 +00:00 committed by Gerrit Code Review
parent dea28d4d04 874aae88a8
commit 5bec7f9ae8
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
anchor/X509/certificate.py
View File

@ -228,8 +228,8 @@ class X509Certificate(signature.SignatureMixin):
self._cert['tbsCertificate']['signature'] = algo_id
def _embed_signature(self, algo_id, signature):
self._cert['signatureValue'] = "'%s'B" % (
utils.bytes_to_bin(signature),)
self._cert['signatureValue'] = "'%s'H" % (
str(binascii.hexlify(signature).decode('ascii')),)
self._cert['signatureAlgorithm'] = algo_id
def _get_signature(self):

4
anchor/X509/signing_request.py
View File

@ -13,6 +13,7 @@
from __future__ import absolute_import
import binascii
import io
from pyasn1.codec.der import decoder
@ -204,4 +205,5 @@ class X509Csr(signature.SignatureMixin):
def _embed_signature(self, algo_id, signature):
self._csr['signatureAlgorithm'] = algo_id
self._csr['signature'] = "'%s'B" % (utils.bytes_to_bin(signature),)
self._csr['signature'] = "'%s'H" % (
str(binascii.hexlify(signature).decode('ascii')),)

14
anchor/X509/utils.py
View File

@ -136,20 +136,6 @@ def _pad_byte(bits):
return ((8-r) % 8)*'0' + bits
def bytes_to_bin(bytes):
"""Convert byte string to bit string."""
return "".join([_pad_byte(_int_to_bin(_ord(byte))) for byte in bytes])
def _int_to_bin(n):
if n == 0 or n == 1:
return str(n)
elif n % 2 == 0:
return _int_to_bin(n // 2) + "0"
else:
return _int_to_bin(n // 2) + "1"
def get_hash_class(md):
return getattr(hashes, md.upper(), None)