From 5c1bd5f82d04933e40803503640789223ce5bcc3 Mon Sep 17 00:00:00 2001 From: qo-op Date: Fri, 4 Dec 2020 02:25:03 +0100 Subject: [PATCH] pkey.Type = crypto_pb2.KeyType.Ed25519 trouble between libprotoc 3.6.1 and libprotoc 3.0.0 --- .../__pycache__/crypto_pb2.cpython-36.pyc | Bin 2974 -> 3040 bytes ...eate_ipfsnodeid_from_tmp_secret.dunikey.py | 3 +- zen/tools/crypto_pb2.py | 29 +++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/zen/tools/__pycache__/crypto_pb2.cpython-36.pyc b/zen/tools/__pycache__/crypto_pb2.cpython-36.pyc index b86094b061253dbb476d60b73b356afb2893c8a3..ba72c329458995fb1ecdc5beef84a296f951dffa 100644 GIT binary patch delta 967 zcmZ`%J8aWX6!mlLIB^;~NfYPO{M{DPHZ5)GPwD_d>QJd_1&HA-QNn$MSZ!MDAayHJ z76i&ry`7O6iJ1u&q)P0WkXRTPK&&9R&(O33_~>1qcYJ)Vul!!5Kc?;FXjDIY_P+6X zT#`OXm#z%*8@Rkzr#3qQ2_pOIfk6!-v8ZGAB^qOz6NfQ~g27}k`vhVGg(g_c8E1(; zL7(O%Ar1*3EP*@)aTJ3Q)j4!a(ItF9B1|G;YTmEfba=?c4B5+x~0 zN|ZEz6Wk*9w<6+byE#$v{AGBX%<*sG1-`D=Z%v~} z&D*Tq@p{bNVV>7)Gj~O(k%vvM@pm{HZR|B&kL~`Ml}5HY`{x^eqSvcm@r@8ElCcW} uLaIV!A7ipE^E3UP86*k`k`O|$5MPYc|Dh!d0gB)+a^b=s;2&_|Mv;IZ=-Q=g&mA=e#QC^qzWd$pocrK>DZVJ0E6Jq(?(=Eu zYEF{AN@HJ{_;nh=^Ai(~G3loIlAXq=n}GyOKoVt0^%=!SvP)2~ z%TTf_AluWl)eKa@5C@?Vb*p@f89Gg72bpmCm^D^^O&!^h1ZW!*k|A4wMOYeSY$L2= z!TGT|@0pSMTLrg98tuw@HBW_^UZ9sKH!dl2IVmV?a zWQnESS3?{^*{w7Q4A zPS*?gJ$0p&q81sd9S`tmsCf?#w$b;qr14kk8cXqS6tldl-7jW*Vf76WsMjPvFG7Kz zYMZRVe`uyA()>EFL^tw(t+h}Tp~3f}%j?2qCp$q4k9z1qdwU=KjL--*PS!6yD75>pi>htSwWgr^c)=@?U(#$p7G Yn9hTQ^^f*CVN5YyPEn>F8T}(a0kvq;@&Et; diff --git a/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py b/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py index e442838..0bae25d 100755 --- a/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py +++ b/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py @@ -42,7 +42,8 @@ print('PeerID={}'.format(ipfs_pid.decode('ascii'))) # Serializing private key in IPFS-native mode, the private key contains public one 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 PrivKey = base64.b64encode(pkey.SerializeToString()).decode('ascii') print('PrivKEY={}'.format(base64.b64encode(pkey.SerializeToString()).decode('ascii'))) diff --git a/zen/tools/crypto_pb2.py b/zen/tools/crypto_pb2.py index d6b953a..581ca18 100644 --- a/zen/tools/crypto_pb2.py +++ b/zen/tools/crypto_pb2.py @@ -8,6 +8,7 @@ from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,9 +20,9 @@ DESCRIPTOR = _descriptor.FileDescriptor( name='crypto.proto', package='crypto.pb', 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') ) +_sym_db.RegisterFileDescriptor(DESCRIPTOR) _KEYTYPE = _descriptor.EnumDescriptor( name='KeyType', @@ -31,23 +32,23 @@ _KEYTYPE = _descriptor.EnumDescriptor( values=[ _descriptor.EnumValueDescriptor( name='RSA', index=0, number=0, - serialized_options=None, + options=None, type=None), _descriptor.EnumValueDescriptor( name='Ed25519', index=1, number=1, - serialized_options=None, + options=None, type=None), _descriptor.EnumValueDescriptor( name='Secp256k1', index=2, number=2, - serialized_options=None, + options=None, type=None), _descriptor.EnumValueDescriptor( name='ECDSA', index=3, number=3, - serialized_options=None, + options=None, type=None), ], containing_type=None, - serialized_options=None, + options=None, serialized_start=150, serialized_end=207, ) @@ -74,21 +75,21 @@ _PUBLICKEY = _descriptor.Descriptor( has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='Data', full_name='crypto.pb.PublicKey.Data', index=1, number=2, type=12, cpp_type=9, label=2, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -112,21 +113,21 @@ _PRIVATEKEY = _descriptor.Descriptor( has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='Data', full_name='crypto.pb.PrivateKey.Data', index=1, number=2, type=12, cpp_type=9, label=2, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto2', 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['PrivateKey'] = _PRIVATEKEY DESCRIPTOR.enum_types_by_name['KeyType'] = _KEYTYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) PublicKey = _reflection.GeneratedProtocolMessageType('PublicKey', (_message.Message,), dict( DESCRIPTOR = _PUBLICKEY, @@ -158,5 +158,6 @@ PrivateKey = _reflection.GeneratedProtocolMessageType('PrivateKey', (_message.Me _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)