Message
authorVolker Birk <vb@pep-project.org>
Mon, 16 May 2016 10:50:50 +0200
changeset 631b2be2f799950
parent 630 62a0c0a180d6
child 632 a213fafe3f4f
Message
asn.1/Makefile
asn.1/devicegroup.asn1
asn.1/pEp.asn1
     1.1 --- a/asn.1/Makefile	Sun May 15 22:37:24 2016 +0200
     1.2 +++ b/asn.1/Makefile	Mon May 16 10:50:50 2016 +0200
     1.3 @@ -1,12 +1,12 @@
     1.4  include ../Makefile.conf
     1.5  
     1.6 -all: Beacon.c Beacon.h
     1.7 +all: Message.c Message.h
     1.8  
     1.9  %.o: %.c %.h
    1.10  	$(CC) $(CFLAGS) -I$(ASN1C_INCLUDE) -c $< -o $@
    1.11  
    1.12 -Beacon.c Beacon.h: devicegroup.asn1
    1.13 -	$(ASN1C) -gen-PER -fcompound-names pEp.asn1 $<
    1.14 +Message.c Message.h: devicegroup.asn1
    1.15 +	$(ASN1C) -fcompound-names -pdu=PEP.Message pEp.asn1 $<
    1.16  
    1.17  .PHONY: clean
    1.18  
     2.1 --- a/asn.1/devicegroup.asn1	Sun May 15 22:37:24 2016 +0200
     2.2 +++ b/asn.1/devicegroup.asn1	Mon May 16 10:50:50 2016 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4 -DEVICEGROUP DEFINITIONS ::=
     2.5 +DEVICEGROUP DEFINITIONS AUTOMATIC TAGS ::=
     2.6  BEGIN
     2.7  
     2.8  Beacon ::= SEQUENCE {
     2.9 @@ -19,5 +19,11 @@
    2.10      keylist PEP.Stringlist
    2.11  }
    2.12  
    2.13 +Message ::= CHOICE {
    2.14 +    beacon Beacon,
    2.15 +    handshakeRequest HandshakeRequest,
    2.16 +    ownKeys OwnKeys
    2.17 +}
    2.18 +
    2.19  END
    2.20  
     3.1 --- a/asn.1/pEp.asn1	Sun May 15 22:37:24 2016 +0200
     3.2 +++ b/asn.1/pEp.asn1	Mon May 16 10:50:50 2016 +0200
     3.3 @@ -20,7 +20,8 @@
     3.4  Header ::= SEQUENCE {
     3.5      protocol    INTEGER (0..65535),
     3.6      version     Version,
     3.7 -    message     INTEGER (0..65535)
     3.8 +    message     INTEGER (0..65535),
     3.9 +    sequence    INTEGER
    3.10  }
    3.11  
    3.12  END