diff options
| author | Björn Gustavsson <[email protected]> | 2013-10-18 14:23:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-10-18 14:23:39 +0200 |
| commit | 5a69967bf89327368cd45e000df054953fa74f10 (patch) | |
| tree | 41d79a3dbd953e21c0558f60c9f311974033c80b /lib/asn1/test/asn1_SUITE_data | |
| parent | 0aae26d8df1aba1f3a8551e4bf1fc097f13a0bea (diff) | |
| parent | 666b46a914ddc23ad666222476163c46c06d2b14 (diff) | |
| download | otp-5a69967bf89327368cd45e000df054953fa74f10.tar.gz otp-5a69967bf89327368cd45e000df054953fa74f10.tar.bz2 otp-5a69967bf89327368cd45e000df054953fa74f10.zip | |
Merge branch 'maint'
* maint:
Fix broken handling of default values for BIT STRINGs
Diffstat (limited to 'lib/asn1/test/asn1_SUITE_data')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/Default.asn | 3 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/Default.asn b/lib/asn1/test/asn1_SUITE_data/Default.asn index 6604953c1f..168ce50bb2 100644 --- a/lib/asn1/test/asn1_SUITE_data/Default.asn +++ b/lib/asn1/test/asn1_SUITE_data/Default.asn @@ -21,7 +21,8 @@ SeqBS ::= SEQUENCE { a BIT STRING DEFAULT '1010110'B, b BIT STRING DEFAULT 'A8A'H, c BIT STRING {first(0),second(1),third(2)} DEFAULT {second}, - d BIT STRING DEFAULT onelist + d BIT STRING DEFAULT onelist, + e BIT STRING DEFAULT '01011010'B } SetBS ::= SET { diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 index 08e7f94ab6..a5b4c8a53d 100644 --- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 @@ -46,7 +46,13 @@ BS256 ::= BIT STRING (SIZE (256)) BS1024 ::= BIT STRING (SIZE (1024)) - + BsDef1 ::= SEQUENCE { + s BIT STRING DEFAULT '101111'B + } + + BsDef2 ::= SEQUENCE { + s BIT STRING DEFAULT 'DEADBEEF'H + } Os ::= OCTET STRING OsCon ::= [60] OCTET STRING |