pkey.Type = crypto_pb2.KeyType.Ed25519 trouble between libprotoc 3.6.1 and libprotoc 3.0.0
This commit is contained in:
parent
13163b25e0
commit
5c1bd5f82d
Binary file not shown.
|
@ -42,7 +42,8 @@ print('PeerID={}'.format(ipfs_pid.decode('ascii')))
|
||||||
|
|
||||||
# Serializing private key in IPFS-native mode, the private key contains public one
|
# Serializing private key in IPFS-native mode, the private key contains public one
|
||||||
pkey = crypto_pb2.PrivateKey()
|
pkey = crypto_pb2.PrivateKey()
|
||||||
pkey.Type = crypto_pb2.KeyType.Ed25519
|
#pkey.Type = crypto_pb2.KeyType.Ed25519
|
||||||
|
pkey.Type = 1
|
||||||
pkey.Data = ipfs_secure_bytes + ipfs_shared_bytes
|
pkey.Data = ipfs_secure_bytes + ipfs_shared_bytes
|
||||||
PrivKey = base64.b64encode(pkey.SerializeToString()).decode('ascii')
|
PrivKey = base64.b64encode(pkey.SerializeToString()).decode('ascii')
|
||||||
print('PrivKEY={}'.format(base64.b64encode(pkey.SerializeToString()).decode('ascii')))
|
print('PrivKEY={}'.format(base64.b64encode(pkey.SerializeToString()).decode('ascii')))
|
||||||
|
|
|
@ -8,6 +8,7 @@ from google.protobuf import descriptor as _descriptor
|
||||||
from google.protobuf import message as _message
|
from google.protobuf import message as _message
|
||||||
from google.protobuf import reflection as _reflection
|
from google.protobuf import reflection as _reflection
|
||||||
from google.protobuf import symbol_database as _symbol_database
|
from google.protobuf import symbol_database as _symbol_database
|
||||||
|
from google.protobuf import descriptor_pb2
|
||||||
# @@protoc_insertion_point(imports)
|
# @@protoc_insertion_point(imports)
|
||||||
|
|
||||||
_sym_db = _symbol_database.Default()
|
_sym_db = _symbol_database.Default()
|
||||||
|
@ -19,9 +20,9 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||||
name='crypto.proto',
|
name='crypto.proto',
|
||||||
package='crypto.pb',
|
package='crypto.pb',
|
||||||
syntax='proto2',
|
syntax='proto2',
|
||||||
serialized_options=_b('Z*github.com/libp2p/go-libp2p-core/crypto/pb'),
|
|
||||||
serialized_pb=_b('\n\x0c\x63rypto.proto\x12\tcrypto.pb\";\n\tPublicKey\x12 \n\x04Type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x44\x61ta\x18\x02 \x02(\x0c\"<\n\nPrivateKey\x12 \n\x04Type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x44\x61ta\x18\x02 \x02(\x0c*9\n\x07KeyType\x12\x07\n\x03RSA\x10\x00\x12\x0b\n\x07\x45\x64\x32\x35\x35\x31\x39\x10\x01\x12\r\n\tSecp256k1\x10\x02\x12\t\n\x05\x45\x43\x44SA\x10\x03\x42,Z*github.com/libp2p/go-libp2p-core/crypto/pb')
|
serialized_pb=_b('\n\x0c\x63rypto.proto\x12\tcrypto.pb\";\n\tPublicKey\x12 \n\x04Type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x44\x61ta\x18\x02 \x02(\x0c\"<\n\nPrivateKey\x12 \n\x04Type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x44\x61ta\x18\x02 \x02(\x0c*9\n\x07KeyType\x12\x07\n\x03RSA\x10\x00\x12\x0b\n\x07\x45\x64\x32\x35\x35\x31\x39\x10\x01\x12\r\n\tSecp256k1\x10\x02\x12\t\n\x05\x45\x43\x44SA\x10\x03\x42,Z*github.com/libp2p/go-libp2p-core/crypto/pb')
|
||||||
)
|
)
|
||||||
|
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||||
|
|
||||||
_KEYTYPE = _descriptor.EnumDescriptor(
|
_KEYTYPE = _descriptor.EnumDescriptor(
|
||||||
name='KeyType',
|
name='KeyType',
|
||||||
|
@ -31,23 +32,23 @@ _KEYTYPE = _descriptor.EnumDescriptor(
|
||||||
values=[
|
values=[
|
||||||
_descriptor.EnumValueDescriptor(
|
_descriptor.EnumValueDescriptor(
|
||||||
name='RSA', index=0, number=0,
|
name='RSA', index=0, number=0,
|
||||||
serialized_options=None,
|
options=None,
|
||||||
type=None),
|
type=None),
|
||||||
_descriptor.EnumValueDescriptor(
|
_descriptor.EnumValueDescriptor(
|
||||||
name='Ed25519', index=1, number=1,
|
name='Ed25519', index=1, number=1,
|
||||||
serialized_options=None,
|
options=None,
|
||||||
type=None),
|
type=None),
|
||||||
_descriptor.EnumValueDescriptor(
|
_descriptor.EnumValueDescriptor(
|
||||||
name='Secp256k1', index=2, number=2,
|
name='Secp256k1', index=2, number=2,
|
||||||
serialized_options=None,
|
options=None,
|
||||||
type=None),
|
type=None),
|
||||||
_descriptor.EnumValueDescriptor(
|
_descriptor.EnumValueDescriptor(
|
||||||
name='ECDSA', index=3, number=3,
|
name='ECDSA', index=3, number=3,
|
||||||
serialized_options=None,
|
options=None,
|
||||||
type=None),
|
type=None),
|
||||||
],
|
],
|
||||||
containing_type=None,
|
containing_type=None,
|
||||||
serialized_options=None,
|
options=None,
|
||||||
serialized_start=150,
|
serialized_start=150,
|
||||||
serialized_end=207,
|
serialized_end=207,
|
||||||
)
|
)
|
||||||
|
@ -74,21 +75,21 @@ _PUBLICKEY = _descriptor.Descriptor(
|
||||||
has_default_value=False, default_value=0,
|
has_default_value=False, default_value=0,
|
||||||
message_type=None, enum_type=None, containing_type=None,
|
message_type=None, enum_type=None, containing_type=None,
|
||||||
is_extension=False, extension_scope=None,
|
is_extension=False, extension_scope=None,
|
||||||
serialized_options=None, file=DESCRIPTOR),
|
options=None),
|
||||||
_descriptor.FieldDescriptor(
|
_descriptor.FieldDescriptor(
|
||||||
name='Data', full_name='crypto.pb.PublicKey.Data', index=1,
|
name='Data', full_name='crypto.pb.PublicKey.Data', index=1,
|
||||||
number=2, type=12, cpp_type=9, label=2,
|
number=2, type=12, cpp_type=9, label=2,
|
||||||
has_default_value=False, default_value=_b(""),
|
has_default_value=False, default_value=_b(""),
|
||||||
message_type=None, enum_type=None, containing_type=None,
|
message_type=None, enum_type=None, containing_type=None,
|
||||||
is_extension=False, extension_scope=None,
|
is_extension=False, extension_scope=None,
|
||||||
serialized_options=None, file=DESCRIPTOR),
|
options=None),
|
||||||
],
|
],
|
||||||
extensions=[
|
extensions=[
|
||||||
],
|
],
|
||||||
nested_types=[],
|
nested_types=[],
|
||||||
enum_types=[
|
enum_types=[
|
||||||
],
|
],
|
||||||
serialized_options=None,
|
options=None,
|
||||||
is_extendable=False,
|
is_extendable=False,
|
||||||
syntax='proto2',
|
syntax='proto2',
|
||||||
extension_ranges=[],
|
extension_ranges=[],
|
||||||
|
@ -112,21 +113,21 @@ _PRIVATEKEY = _descriptor.Descriptor(
|
||||||
has_default_value=False, default_value=0,
|
has_default_value=False, default_value=0,
|
||||||
message_type=None, enum_type=None, containing_type=None,
|
message_type=None, enum_type=None, containing_type=None,
|
||||||
is_extension=False, extension_scope=None,
|
is_extension=False, extension_scope=None,
|
||||||
serialized_options=None, file=DESCRIPTOR),
|
options=None),
|
||||||
_descriptor.FieldDescriptor(
|
_descriptor.FieldDescriptor(
|
||||||
name='Data', full_name='crypto.pb.PrivateKey.Data', index=1,
|
name='Data', full_name='crypto.pb.PrivateKey.Data', index=1,
|
||||||
number=2, type=12, cpp_type=9, label=2,
|
number=2, type=12, cpp_type=9, label=2,
|
||||||
has_default_value=False, default_value=_b(""),
|
has_default_value=False, default_value=_b(""),
|
||||||
message_type=None, enum_type=None, containing_type=None,
|
message_type=None, enum_type=None, containing_type=None,
|
||||||
is_extension=False, extension_scope=None,
|
is_extension=False, extension_scope=None,
|
||||||
serialized_options=None, file=DESCRIPTOR),
|
options=None),
|
||||||
],
|
],
|
||||||
extensions=[
|
extensions=[
|
||||||
],
|
],
|
||||||
nested_types=[],
|
nested_types=[],
|
||||||
enum_types=[
|
enum_types=[
|
||||||
],
|
],
|
||||||
serialized_options=None,
|
options=None,
|
||||||
is_extendable=False,
|
is_extendable=False,
|
||||||
syntax='proto2',
|
syntax='proto2',
|
||||||
extension_ranges=[],
|
extension_ranges=[],
|
||||||
|
@ -141,7 +142,6 @@ _PRIVATEKEY.fields_by_name['Type'].enum_type = _KEYTYPE
|
||||||
DESCRIPTOR.message_types_by_name['PublicKey'] = _PUBLICKEY
|
DESCRIPTOR.message_types_by_name['PublicKey'] = _PUBLICKEY
|
||||||
DESCRIPTOR.message_types_by_name['PrivateKey'] = _PRIVATEKEY
|
DESCRIPTOR.message_types_by_name['PrivateKey'] = _PRIVATEKEY
|
||||||
DESCRIPTOR.enum_types_by_name['KeyType'] = _KEYTYPE
|
DESCRIPTOR.enum_types_by_name['KeyType'] = _KEYTYPE
|
||||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
|
||||||
|
|
||||||
PublicKey = _reflection.GeneratedProtocolMessageType('PublicKey', (_message.Message,), dict(
|
PublicKey = _reflection.GeneratedProtocolMessageType('PublicKey', (_message.Message,), dict(
|
||||||
DESCRIPTOR = _PUBLICKEY,
|
DESCRIPTOR = _PUBLICKEY,
|
||||||
|
@ -158,5 +158,6 @@ PrivateKey = _reflection.GeneratedProtocolMessageType('PrivateKey', (_message.Me
|
||||||
_sym_db.RegisterMessage(PrivateKey)
|
_sym_db.RegisterMessage(PrivateKey)
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTOR._options = None
|
DESCRIPTOR.has_options = True
|
||||||
|
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z*github.com/libp2p/go-libp2p-core/crypto/pb'))
|
||||||
# @@protoc_insertion_point(module_scope)
|
# @@protoc_insertion_point(module_scope)
|
||||||
|
|
Loading…
Reference in New Issue