Kaynağa Gözat

protocomm: Regenerated proto-c and python with protobuf compiler v3.21.0

Laukik Hase 3 yıl önce
ebeveyn
işleme
a3f5087336

+ 2 - 2
components/protocomm/proto-c/constants.pb-c.h

@@ -10,7 +10,7 @@ PROTOBUF_C__BEGIN_DECLS
 
 #if PROTOBUF_C_VERSION_NUMBER < 1003000
 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
@@ -21,7 +21,7 @@ PROTOBUF_C__BEGIN_DECLS
 
 /*
  * Allowed values for the status
- * of a protocomm instance
+ * of a protocomm instance 
  */
 typedef enum _Status {
   STATUS__Success = 0,

+ 15 - 15
components/protocomm/proto-c/sec0.pb-c.h

@@ -10,21 +10,21 @@ PROTOBUF_C__BEGIN_DECLS
 
 #if PROTOBUF_C_VERSION_NUMBER < 1003000
 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
 #include "constants.pb-c.h"
 
-typedef struct _S0SessionCmd S0SessionCmd;
-typedef struct _S0SessionResp S0SessionResp;
-typedef struct _Sec0Payload Sec0Payload;
+typedef struct S0SessionCmd S0SessionCmd;
+typedef struct S0SessionResp S0SessionResp;
+typedef struct Sec0Payload Sec0Payload;
 
 
 /* --- enums --- */
 
 /*
- * A message must be of type Cmd or Resp
+ * A message must be of type Cmd or Resp 
  */
 typedef enum _Sec0MsgType {
   SEC0_MSG_TYPE__S0_Session_Command = 0,
@@ -35,9 +35,9 @@ typedef enum _Sec0MsgType {
 /* --- messages --- */
 
 /*
- * Data structure of Session command/request packet
+ * Data structure of Session command/request packet 
  */
-struct  _S0SessionCmd
+struct  S0SessionCmd
 {
   ProtobufCMessage base;
 };
@@ -47,9 +47,9 @@ struct  _S0SessionCmd
 
 
 /*
- * Data structure of Session response packet
+ * Data structure of Session response packet 
  */
-struct  _S0SessionResp
+struct  S0SessionResp
 {
   ProtobufCMessage base;
   Status status;
@@ -63,27 +63,27 @@ typedef enum {
   SEC0_PAYLOAD__PAYLOAD__NOT_SET = 0,
   SEC0_PAYLOAD__PAYLOAD_SC = 20,
   SEC0_PAYLOAD__PAYLOAD_SR = 21
-    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC0_PAYLOAD__PAYLOAD)
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC0_PAYLOAD__PAYLOAD__CASE)
 } Sec0Payload__PayloadCase;
 
 /*
- * Payload structure of session data
+ * Payload structure of session data 
  */
-struct  _Sec0Payload
+struct  Sec0Payload
 {
   ProtobufCMessage base;
   /*
-   *!< Type of message
+   *!< Type of message 
    */
   Sec0MsgType msg;
   Sec0Payload__PayloadCase payload_case;
   union {
     /*
-     *!< Payload data interpreted as Cmd
+     *!< Payload data interpreted as Cmd 
      */
     S0SessionCmd *sc;
     /*
-     *!< Payload data interpreted as Resp
+     *!< Payload data interpreted as Resp 
      */
     S0SessionResp *sr;
   };

+ 23 - 23
components/protocomm/proto-c/sec1.pb-c.h

@@ -10,23 +10,23 @@ PROTOBUF_C__BEGIN_DECLS
 
 #if PROTOBUF_C_VERSION_NUMBER < 1003000
 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
 #include "constants.pb-c.h"
 
-typedef struct _SessionCmd1 SessionCmd1;
-typedef struct _SessionResp1 SessionResp1;
-typedef struct _SessionCmd0 SessionCmd0;
-typedef struct _SessionResp0 SessionResp0;
-typedef struct _Sec1Payload Sec1Payload;
+typedef struct SessionCmd1 SessionCmd1;
+typedef struct SessionResp1 SessionResp1;
+typedef struct SessionCmd0 SessionCmd0;
+typedef struct SessionResp0 SessionResp0;
+typedef struct Sec1Payload Sec1Payload;
 
 
 /* --- enums --- */
 
 /*
- * A message must be of type Cmd0 / Cmd1 / Resp0 / Resp1
+ * A message must be of type Cmd0 / Cmd1 / Resp0 / Resp1 
  */
 typedef enum _Sec1MsgType {
   SEC1_MSG_TYPE__Session_Command0 = 0,
@@ -39,9 +39,9 @@ typedef enum _Sec1MsgType {
 /* --- messages --- */
 
 /*
- * Data structure of Session command1 packet
+ * Data structure of Session command1 packet 
  */
-struct  _SessionCmd1
+struct  SessionCmd1
 {
   ProtobufCMessage base;
   ProtobufCBinaryData client_verify_data;
@@ -52,9 +52,9 @@ struct  _SessionCmd1
 
 
 /*
- * Data structure of Session response1 packet
+ * Data structure of Session response1 packet 
  */
-struct  _SessionResp1
+struct  SessionResp1
 {
   ProtobufCMessage base;
   Status status;
@@ -66,9 +66,9 @@ struct  _SessionResp1
 
 
 /*
- * Data structure of Session command0 packet
+ * Data structure of Session command0 packet 
  */
-struct  _SessionCmd0
+struct  SessionCmd0
 {
   ProtobufCMessage base;
   ProtobufCBinaryData client_pubkey;
@@ -79,9 +79,9 @@ struct  _SessionCmd0
 
 
 /*
- * Data structure of Session response0 packet
+ * Data structure of Session response0 packet 
  */
-struct  _SessionResp0
+struct  SessionResp0
 {
   ProtobufCMessage base;
   Status status;
@@ -99,35 +99,35 @@ typedef enum {
   SEC1_PAYLOAD__PAYLOAD_SR0 = 21,
   SEC1_PAYLOAD__PAYLOAD_SC1 = 22,
   SEC1_PAYLOAD__PAYLOAD_SR1 = 23
-    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC1_PAYLOAD__PAYLOAD)
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC1_PAYLOAD__PAYLOAD__CASE)
 } Sec1Payload__PayloadCase;
 
 /*
- * Payload structure of session data
+ * Payload structure of session data 
  */
-struct  _Sec1Payload
+struct  Sec1Payload
 {
   ProtobufCMessage base;
   /*
-   *!< Type of message
+   *!< Type of message 
    */
   Sec1MsgType msg;
   Sec1Payload__PayloadCase payload_case;
   union {
     /*
-     *!< Payload data interpreted as Cmd0
+     *!< Payload data interpreted as Cmd0 
      */
     SessionCmd0 *sc0;
     /*
-     *!< Payload data interpreted as Resp0
+     *!< Payload data interpreted as Resp0 
      */
     SessionResp0 *sr0;
     /*
-     *!< Payload data interpreted as Cmd1
+     *!< Payload data interpreted as Cmd1 
      */
     SessionCmd1 *sc1;
     /*
-     *!< Payload data interpreted as Resp1
+     *!< Payload data interpreted as Resp1 
      */
     SessionResp1 *sr1;
   };

+ 10 - 10
components/protocomm/proto-c/session.pb-c.h

@@ -10,25 +10,25 @@ PROTOBUF_C__BEGIN_DECLS
 
 #if PROTOBUF_C_VERSION_NUMBER < 1003000
 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
 #include "sec0.pb-c.h"
 #include "sec1.pb-c.h"
 
-typedef struct _SessionData SessionData;
+typedef struct SessionData SessionData;
 
 
 /* --- enums --- */
 
 /*
  * Allowed values for the type of security
- * being used in a protocomm session
+ * being used in a protocomm session 
  */
 typedef enum _SecSchemeVersion {
   /*
-   *!< Unsecured - plaintext communication
+   *!< Unsecured - plaintext communication 
    */
   SEC_SCHEME_VERSION__SecScheme0 = 0,
   /*
@@ -44,28 +44,28 @@ typedef enum {
   SESSION_DATA__PROTO__NOT_SET = 0,
   SESSION_DATA__PROTO_SEC0 = 10,
   SESSION_DATA__PROTO_SEC1 = 11
-    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SESSION_DATA__PROTO)
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SESSION_DATA__PROTO__CASE)
 } SessionData__ProtoCase;
 
 /*
  * Data structure exchanged when establishing
- * secure session between Host and Client
+ * secure session between Host and Client 
  */
-struct  _SessionData
+struct  SessionData
 {
   ProtobufCMessage base;
   /*
-   *!< Type of security
+   *!< Type of security 
    */
   SecSchemeVersion sec_ver;
   SessionData__ProtoCase proto_case;
   union {
     /*
-     *!< Payload data in case of security 0
+     *!< Payload data in case of security 0 
      */
     Sec0Payload *sec0;
     /*
-     *!< Payload data in case of security 1
+     *!< Payload data in case of security 1 
      */
     Sec1Payload *sec1;
   };

+ 11 - 75
components/protocomm/python/constants_pb2.py

@@ -1,16 +1,11 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: constants.proto
-
-import sys
-
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pb2
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
+from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import enum_type_wrapper
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,72 +13,13 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='constants.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x0f\x63onstants.proto*\x9f\x01\n\x06Status\x12\x0b\n\x07Success\x10\x00\x12\x14\n\x10InvalidSecScheme\x10\x01\x12\x10\n\x0cInvalidProto\x10\x02\x12\x13\n\x0fTooManySessions\x10\x03\x12\x13\n\x0fInvalidArgument\x10\x04\x12\x11\n\rInternalError\x10\x05\x12\x0f\n\x0b\x43ryptoError\x10\x06\x12\x12\n\x0eInvalidSession\x10\x07\x62\x06proto3')
-)
-
-_STATUS = _descriptor.EnumDescriptor(
-  name='Status',
-  full_name='Status',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='Success', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='InvalidSecScheme', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='InvalidProto', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='TooManySessions', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='InvalidArgument', index=4, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='InternalError', index=5, number=5,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CryptoError', index=6, number=6,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='InvalidSession', index=7, number=7,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=20,
-  serialized_end=179,
-)
-_sym_db.RegisterEnumDescriptor(_STATUS)
-
-Status = enum_type_wrapper.EnumTypeWrapper(_STATUS)
-Success = 0
-InvalidSecScheme = 1
-InvalidProto = 2
-TooManySessions = 3
-InvalidArgument = 4
-InternalError = 5
-CryptoError = 6
-InvalidSession = 7
-
-
-DESCRIPTOR.enum_types_by_name['Status'] = _STATUS
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63onstants.proto*\x9f\x01\n\x06Status\x12\x0b\n\x07Success\x10\x00\x12\x14\n\x10InvalidSecScheme\x10\x01\x12\x10\n\x0cInvalidProto\x10\x02\x12\x13\n\x0fTooManySessions\x10\x03\x12\x13\n\x0fInvalidArgument\x10\x04\x12\x11\n\rInternalError\x10\x05\x12\x0f\n\x0b\x43ryptoError\x10\x06\x12\x12\n\x0eInvalidSession\x10\x07\x62\x06proto3')
 
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'constants_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
 
+  DESCRIPTOR._options = None
+  _STATUS._serialized_start=20
+  _STATUS._serialized_end=179
 # @@protoc_insertion_point(module_scope)

+ 17 - 182
components/protocomm/python/sec0_pb2.py

@@ -1,16 +1,11 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: sec0.proto
-
-import sys
-
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pb2
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
+from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import enum_type_wrapper
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,180 +13,20 @@ _sym_db = _symbol_database.Default()
 
 import constants_pb2 as constants__pb2
 
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='sec0.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\nsec0.proto\x1a\x0f\x63onstants.proto\"\x0e\n\x0cS0SessionCmd\"(\n\rS0SessionResp\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"n\n\x0bSec0Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec0MsgType\x12\x1b\n\x02sc\x18\x14 \x01(\x0b\x32\r.S0SessionCmdH\x00\x12\x1c\n\x02sr\x18\x15 \x01(\x0b\x32\x0e.S0SessionRespH\x00\x42\t\n\x07payload*>\n\x0bSec0MsgType\x12\x16\n\x12S0_Session_Command\x10\x00\x12\x17\n\x13S0_Session_Response\x10\x01\x62\x06proto3')
-  ,
-  dependencies=[constants__pb2.DESCRIPTOR,])
-
-_SEC0MSGTYPE = _descriptor.EnumDescriptor(
-  name='Sec0MsgType',
-  full_name='Sec0MsgType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='S0_Session_Command', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='S0_Session_Response', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=201,
-  serialized_end=263,
-)
-_sym_db.RegisterEnumDescriptor(_SEC0MSGTYPE)
-
-Sec0MsgType = enum_type_wrapper.EnumTypeWrapper(_SEC0MSGTYPE)
-S0_Session_Command = 0
-S0_Session_Response = 1
-
-
-
-_S0SESSIONCMD = _descriptor.Descriptor(
-  name='S0SessionCmd',
-  full_name='S0SessionCmd',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=31,
-  serialized_end=45,
-)
-
-
-_S0SESSIONRESP = _descriptor.Descriptor(
-  name='S0SessionResp',
-  full_name='S0SessionResp',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='status', full_name='S0SessionResp.status', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=47,
-  serialized_end=87,
-)
-
-
-_SEC0PAYLOAD = _descriptor.Descriptor(
-  name='Sec0Payload',
-  full_name='Sec0Payload',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='msg', full_name='Sec0Payload.msg', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sc', full_name='Sec0Payload.sc', index=1,
-      number=20, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sr', full_name='Sec0Payload.sr', index=2,
-      number=21, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-    _descriptor.OneofDescriptor(
-      name='payload', full_name='Sec0Payload.payload',
-      index=0, containing_type=None, fields=[]),
-  ],
-  serialized_start=89,
-  serialized_end=199,
-)
-
-_S0SESSIONRESP.fields_by_name['status'].enum_type = constants__pb2._STATUS
-_SEC0PAYLOAD.fields_by_name['msg'].enum_type = _SEC0MSGTYPE
-_SEC0PAYLOAD.fields_by_name['sc'].message_type = _S0SESSIONCMD
-_SEC0PAYLOAD.fields_by_name['sr'].message_type = _S0SESSIONRESP
-_SEC0PAYLOAD.oneofs_by_name['payload'].fields.append(
-  _SEC0PAYLOAD.fields_by_name['sc'])
-_SEC0PAYLOAD.fields_by_name['sc'].containing_oneof = _SEC0PAYLOAD.oneofs_by_name['payload']
-_SEC0PAYLOAD.oneofs_by_name['payload'].fields.append(
-  _SEC0PAYLOAD.fields_by_name['sr'])
-_SEC0PAYLOAD.fields_by_name['sr'].containing_oneof = _SEC0PAYLOAD.oneofs_by_name['payload']
-DESCRIPTOR.message_types_by_name['S0SessionCmd'] = _S0SESSIONCMD
-DESCRIPTOR.message_types_by_name['S0SessionResp'] = _S0SESSIONRESP
-DESCRIPTOR.message_types_by_name['Sec0Payload'] = _SEC0PAYLOAD
-DESCRIPTOR.enum_types_by_name['Sec0MsgType'] = _SEC0MSGTYPE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-S0SessionCmd = _reflection.GeneratedProtocolMessageType('S0SessionCmd', (_message.Message,), dict(
-  DESCRIPTOR = _S0SESSIONCMD,
-  __module__ = 'sec0_pb2'
-  # @@protoc_insertion_point(class_scope:S0SessionCmd)
-  ))
-_sym_db.RegisterMessage(S0SessionCmd)
-
-S0SessionResp = _reflection.GeneratedProtocolMessageType('S0SessionResp', (_message.Message,), dict(
-  DESCRIPTOR = _S0SESSIONRESP,
-  __module__ = 'sec0_pb2'
-  # @@protoc_insertion_point(class_scope:S0SessionResp)
-  ))
-_sym_db.RegisterMessage(S0SessionResp)
 
-Sec0Payload = _reflection.GeneratedProtocolMessageType('Sec0Payload', (_message.Message,), dict(
-  DESCRIPTOR = _SEC0PAYLOAD,
-  __module__ = 'sec0_pb2'
-  # @@protoc_insertion_point(class_scope:Sec0Payload)
-  ))
-_sym_db.RegisterMessage(Sec0Payload)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nsec0.proto\x1a\x0f\x63onstants.proto\"\x0e\n\x0cS0SessionCmd\"(\n\rS0SessionResp\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"n\n\x0bSec0Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec0MsgType\x12\x1b\n\x02sc\x18\x14 \x01(\x0b\x32\r.S0SessionCmdH\x00\x12\x1c\n\x02sr\x18\x15 \x01(\x0b\x32\x0e.S0SessionRespH\x00\x42\t\n\x07payload*>\n\x0bSec0MsgType\x12\x16\n\x12S0_Session_Command\x10\x00\x12\x17\n\x13S0_Session_Response\x10\x01\x62\x06proto3')
 
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'sec0_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
 
+  DESCRIPTOR._options = None
+  _SEC0MSGTYPE._serialized_start=201
+  _SEC0MSGTYPE._serialized_end=263
+  _S0SESSIONCMD._serialized_start=31
+  _S0SESSIONCMD._serialized_end=45
+  _S0SESSIONRESP._serialized_start=47
+  _S0SESSIONRESP._serialized_end=87
+  _SEC0PAYLOAD._serialized_start=89
+  _SEC0PAYLOAD._serialized_end=199
 # @@protoc_insertion_point(module_scope)

+ 23 - 323
components/protocomm/python/sec1_pb2.py

@@ -1,16 +1,11 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: sec1.proto
-
-import sys
-
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pb2
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
+from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import enum_type_wrapper
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,319 +13,24 @@ _sym_db = _symbol_database.Default()
 
 import constants_pb2 as constants__pb2
 
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='sec1.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\nsec1.proto\x1a\x0f\x63onstants.proto\")\n\x0bSessionCmd1\x12\x1a\n\x12\x63lient_verify_data\x18\x02 \x01(\x0c\"C\n\x0cSessionResp1\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x1a\n\x12\x64\x65vice_verify_data\x18\x03 \x01(\x0c\"$\n\x0bSessionCmd0\x12\x15\n\rclient_pubkey\x18\x01 \x01(\x0c\"U\n\x0cSessionResp0\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x15\n\rdevice_pubkey\x18\x02 \x01(\x0c\x12\x15\n\rdevice_random\x18\x03 \x01(\x0c\"\xa9\x01\n\x0bSec1Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec1MsgType\x12\x1b\n\x03sc0\x18\x14 \x01(\x0b\x32\x0c.SessionCmd0H\x00\x12\x1c\n\x03sr0\x18\x15 \x01(\x0b\x32\r.SessionResp0H\x00\x12\x1b\n\x03sc1\x18\x16 \x01(\x0b\x32\x0c.SessionCmd1H\x00\x12\x1c\n\x03sr1\x18\x17 \x01(\x0b\x32\r.SessionResp1H\x00\x42\t\n\x07payload*g\n\x0bSec1MsgType\x12\x14\n\x10Session_Command0\x10\x00\x12\x15\n\x11Session_Response0\x10\x01\x12\x14\n\x10Session_Command1\x10\x02\x12\x15\n\x11Session_Response1\x10\x03\x62\x06proto3')
-  ,
-  dependencies=[constants__pb2.DESCRIPTOR,])
-
-_SEC1MSGTYPE = _descriptor.EnumDescriptor(
-  name='Sec1MsgType',
-  full_name='Sec1MsgType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='Session_Command0', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='Session_Response0', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='Session_Command1', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='Session_Response1', index=3, number=3,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=440,
-  serialized_end=543,
-)
-_sym_db.RegisterEnumDescriptor(_SEC1MSGTYPE)
-
-Sec1MsgType = enum_type_wrapper.EnumTypeWrapper(_SEC1MSGTYPE)
-Session_Command0 = 0
-Session_Response0 = 1
-Session_Command1 = 2
-Session_Response1 = 3
-
-
-
-_SESSIONCMD1 = _descriptor.Descriptor(
-  name='SessionCmd1',
-  full_name='SessionCmd1',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='client_verify_data', full_name='SessionCmd1.client_verify_data', index=0,
-      number=2, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(''),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=31,
-  serialized_end=72,
-)
-
-
-_SESSIONRESP1 = _descriptor.Descriptor(
-  name='SessionResp1',
-  full_name='SessionResp1',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='status', full_name='SessionResp1.status', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='device_verify_data', full_name='SessionResp1.device_verify_data', index=1,
-      number=3, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(''),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=74,
-  serialized_end=141,
-)
-
-
-_SESSIONCMD0 = _descriptor.Descriptor(
-  name='SessionCmd0',
-  full_name='SessionCmd0',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='client_pubkey', full_name='SessionCmd0.client_pubkey', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(''),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=143,
-  serialized_end=179,
-)
-
-
-_SESSIONRESP0 = _descriptor.Descriptor(
-  name='SessionResp0',
-  full_name='SessionResp0',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='status', full_name='SessionResp0.status', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='device_pubkey', full_name='SessionResp0.device_pubkey', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(''),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='device_random', full_name='SessionResp0.device_random', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(''),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=181,
-  serialized_end=266,
-)
-
-
-_SEC1PAYLOAD = _descriptor.Descriptor(
-  name='Sec1Payload',
-  full_name='Sec1Payload',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='msg', full_name='Sec1Payload.msg', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sc0', full_name='Sec1Payload.sc0', index=1,
-      number=20, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sr0', full_name='Sec1Payload.sr0', index=2,
-      number=21, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sc1', full_name='Sec1Payload.sc1', index=3,
-      number=22, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sr1', full_name='Sec1Payload.sr1', index=4,
-      number=23, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-    _descriptor.OneofDescriptor(
-      name='payload', full_name='Sec1Payload.payload',
-      index=0, containing_type=None, fields=[]),
-  ],
-  serialized_start=269,
-  serialized_end=438,
-)
-
-_SESSIONRESP1.fields_by_name['status'].enum_type = constants__pb2._STATUS
-_SESSIONRESP0.fields_by_name['status'].enum_type = constants__pb2._STATUS
-_SEC1PAYLOAD.fields_by_name['msg'].enum_type = _SEC1MSGTYPE
-_SEC1PAYLOAD.fields_by_name['sc0'].message_type = _SESSIONCMD0
-_SEC1PAYLOAD.fields_by_name['sr0'].message_type = _SESSIONRESP0
-_SEC1PAYLOAD.fields_by_name['sc1'].message_type = _SESSIONCMD1
-_SEC1PAYLOAD.fields_by_name['sr1'].message_type = _SESSIONRESP1
-_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append(
-  _SEC1PAYLOAD.fields_by_name['sc0'])
-_SEC1PAYLOAD.fields_by_name['sc0'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload']
-_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append(
-  _SEC1PAYLOAD.fields_by_name['sr0'])
-_SEC1PAYLOAD.fields_by_name['sr0'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload']
-_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append(
-  _SEC1PAYLOAD.fields_by_name['sc1'])
-_SEC1PAYLOAD.fields_by_name['sc1'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload']
-_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append(
-  _SEC1PAYLOAD.fields_by_name['sr1'])
-_SEC1PAYLOAD.fields_by_name['sr1'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload']
-DESCRIPTOR.message_types_by_name['SessionCmd1'] = _SESSIONCMD1
-DESCRIPTOR.message_types_by_name['SessionResp1'] = _SESSIONRESP1
-DESCRIPTOR.message_types_by_name['SessionCmd0'] = _SESSIONCMD0
-DESCRIPTOR.message_types_by_name['SessionResp0'] = _SESSIONRESP0
-DESCRIPTOR.message_types_by_name['Sec1Payload'] = _SEC1PAYLOAD
-DESCRIPTOR.enum_types_by_name['Sec1MsgType'] = _SEC1MSGTYPE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-SessionCmd1 = _reflection.GeneratedProtocolMessageType('SessionCmd1', (_message.Message,), dict(
-  DESCRIPTOR = _SESSIONCMD1,
-  __module__ = 'sec1_pb2'
-  # @@protoc_insertion_point(class_scope:SessionCmd1)
-  ))
-_sym_db.RegisterMessage(SessionCmd1)
-
-SessionResp1 = _reflection.GeneratedProtocolMessageType('SessionResp1', (_message.Message,), dict(
-  DESCRIPTOR = _SESSIONRESP1,
-  __module__ = 'sec1_pb2'
-  # @@protoc_insertion_point(class_scope:SessionResp1)
-  ))
-_sym_db.RegisterMessage(SessionResp1)
-
-SessionCmd0 = _reflection.GeneratedProtocolMessageType('SessionCmd0', (_message.Message,), dict(
-  DESCRIPTOR = _SESSIONCMD0,
-  __module__ = 'sec1_pb2'
-  # @@protoc_insertion_point(class_scope:SessionCmd0)
-  ))
-_sym_db.RegisterMessage(SessionCmd0)
-
-SessionResp0 = _reflection.GeneratedProtocolMessageType('SessionResp0', (_message.Message,), dict(
-  DESCRIPTOR = _SESSIONRESP0,
-  __module__ = 'sec1_pb2'
-  # @@protoc_insertion_point(class_scope:SessionResp0)
-  ))
-_sym_db.RegisterMessage(SessionResp0)
-
-Sec1Payload = _reflection.GeneratedProtocolMessageType('Sec1Payload', (_message.Message,), dict(
-  DESCRIPTOR = _SEC1PAYLOAD,
-  __module__ = 'sec1_pb2'
-  # @@protoc_insertion_point(class_scope:Sec1Payload)
-  ))
-_sym_db.RegisterMessage(Sec1Payload)
-
 
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nsec1.proto\x1a\x0f\x63onstants.proto\")\n\x0bSessionCmd1\x12\x1a\n\x12\x63lient_verify_data\x18\x02 \x01(\x0c\"C\n\x0cSessionResp1\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x1a\n\x12\x64\x65vice_verify_data\x18\x03 \x01(\x0c\"$\n\x0bSessionCmd0\x12\x15\n\rclient_pubkey\x18\x01 \x01(\x0c\"U\n\x0cSessionResp0\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x15\n\rdevice_pubkey\x18\x02 \x01(\x0c\x12\x15\n\rdevice_random\x18\x03 \x01(\x0c\"\xa9\x01\n\x0bSec1Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec1MsgType\x12\x1b\n\x03sc0\x18\x14 \x01(\x0b\x32\x0c.SessionCmd0H\x00\x12\x1c\n\x03sr0\x18\x15 \x01(\x0b\x32\r.SessionResp0H\x00\x12\x1b\n\x03sc1\x18\x16 \x01(\x0b\x32\x0c.SessionCmd1H\x00\x12\x1c\n\x03sr1\x18\x17 \x01(\x0b\x32\r.SessionResp1H\x00\x42\t\n\x07payload*g\n\x0bSec1MsgType\x12\x14\n\x10Session_Command0\x10\x00\x12\x15\n\x11Session_Response0\x10\x01\x12\x14\n\x10Session_Command1\x10\x02\x12\x15\n\x11Session_Response1\x10\x03\x62\x06proto3')
+
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'sec1_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _SEC1MSGTYPE._serialized_start=440
+  _SEC1MSGTYPE._serialized_end=543
+  _SESSIONCMD1._serialized_start=31
+  _SESSIONCMD1._serialized_end=72
+  _SESSIONRESP1._serialized_start=74
+  _SESSIONRESP1._serialized_end=141
+  _SESSIONCMD0._serialized_start=143
+  _SESSIONCMD0._serialized_end=179
+  _SESSIONRESP0._serialized_start=181
+  _SESSIONRESP0._serialized_end=266
+  _SEC1PAYLOAD._serialized_start=269
+  _SEC1PAYLOAD._serialized_end=438
 # @@protoc_insertion_point(module_scope)

+ 13 - 110
components/protocomm/python/session_pb2.py

@@ -1,16 +1,11 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: session.proto
-
-import sys
-
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pb2
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
+from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import enum_type_wrapper
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,108 +14,16 @@ _sym_db = _symbol_database.Default()
 import sec0_pb2 as sec0__pb2
 import sec1_pb2 as sec1__pb2
 
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='session.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\rsession.proto\x1a\nsec0.proto\x1a\nsec1.proto\"v\n\x0bSessionData\x12\"\n\x07sec_ver\x18\x02 \x01(\x0e\x32\x11.SecSchemeVersion\x12\x1c\n\x04sec0\x18\n \x01(\x0b\x32\x0c.Sec0PayloadH\x00\x12\x1c\n\x04sec1\x18\x0b \x01(\x0b\x32\x0c.Sec1PayloadH\x00\x42\x07\n\x05proto*2\n\x10SecSchemeVersion\x12\x0e\n\nSecScheme0\x10\x00\x12\x0e\n\nSecScheme1\x10\x01\x62\x06proto3')
-  ,
-  dependencies=[sec0__pb2.DESCRIPTOR,sec1__pb2.DESCRIPTOR,])
-
-_SECSCHEMEVERSION = _descriptor.EnumDescriptor(
-  name='SecSchemeVersion',
-  full_name='SecSchemeVersion',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='SecScheme0', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SecScheme1', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=161,
-  serialized_end=211,
-)
-_sym_db.RegisterEnumDescriptor(_SECSCHEMEVERSION)
-
-SecSchemeVersion = enum_type_wrapper.EnumTypeWrapper(_SECSCHEMEVERSION)
-SecScheme0 = 0
-SecScheme1 = 1
-
-
-
-_SESSIONDATA = _descriptor.Descriptor(
-  name='SessionData',
-  full_name='SessionData',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='sec_ver', full_name='SessionData.sec_ver', index=0,
-      number=2, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sec0', full_name='SessionData.sec0', index=1,
-      number=10, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='sec1', full_name='SessionData.sec1', index=2,
-      number=11, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-    _descriptor.OneofDescriptor(
-      name='proto', full_name='SessionData.proto',
-      index=0, containing_type=None, fields=[]),
-  ],
-  serialized_start=41,
-  serialized_end=159,
-)
-
-_SESSIONDATA.fields_by_name['sec_ver'].enum_type = _SECSCHEMEVERSION
-_SESSIONDATA.fields_by_name['sec0'].message_type = sec0__pb2._SEC0PAYLOAD
-_SESSIONDATA.fields_by_name['sec1'].message_type = sec1__pb2._SEC1PAYLOAD
-_SESSIONDATA.oneofs_by_name['proto'].fields.append(
-  _SESSIONDATA.fields_by_name['sec0'])
-_SESSIONDATA.fields_by_name['sec0'].containing_oneof = _SESSIONDATA.oneofs_by_name['proto']
-_SESSIONDATA.oneofs_by_name['proto'].fields.append(
-  _SESSIONDATA.fields_by_name['sec1'])
-_SESSIONDATA.fields_by_name['sec1'].containing_oneof = _SESSIONDATA.oneofs_by_name['proto']
-DESCRIPTOR.message_types_by_name['SessionData'] = _SESSIONDATA
-DESCRIPTOR.enum_types_by_name['SecSchemeVersion'] = _SECSCHEMEVERSION
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-SessionData = _reflection.GeneratedProtocolMessageType('SessionData', (_message.Message,), dict(
-  DESCRIPTOR = _SESSIONDATA,
-  __module__ = 'session_pb2'
-  # @@protoc_insertion_point(class_scope:SessionData)
-  ))
-_sym_db.RegisterMessage(SessionData)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rsession.proto\x1a\nsec0.proto\x1a\nsec1.proto\"v\n\x0bSessionData\x12\"\n\x07sec_ver\x18\x02 \x01(\x0e\x32\x11.SecSchemeVersion\x12\x1c\n\x04sec0\x18\n \x01(\x0b\x32\x0c.Sec0PayloadH\x00\x12\x1c\n\x04sec1\x18\x0b \x01(\x0b\x32\x0c.Sec1PayloadH\x00\x42\x07\n\x05proto*2\n\x10SecSchemeVersion\x12\x0e\n\nSecScheme0\x10\x00\x12\x0e\n\nSecScheme1\x10\x01\x62\x06proto3')
 
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'session_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
 
+  DESCRIPTOR._options = None
+  _SECSCHEMEVERSION._serialized_start=161
+  _SECSCHEMEVERSION._serialized_end=211
+  _SESSIONDATA._serialized_start=41
+  _SESSIONDATA._serialized_end=159
 # @@protoc_insertion_point(module_scope)