diff options
| author | Björn Gustavsson <[email protected]> | 2013-10-18 14:10:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-10-18 14:10:39 +0200 |
| commit | 666b46a914ddc23ad666222476163c46c06d2b14 (patch) | |
| tree | 41ec1f7a949aaae2d4b5ec531c00059c41b9960d /lib/asn1/test/asn1_SUITE_data | |
| parent | 67603840fe02617e9ee3f6fd46b203b94ac5e3c5 (diff) | |
| parent | 6baa1883a9c7f4d9b4be76d1375cf8b2cc614797 (diff) | |
| download | otp-666b46a914ddc23ad666222476163c46c06d2b14.tar.gz otp-666b46a914ddc23ad666222476163c46c06d2b14.tar.bz2 otp-666b46a914ddc23ad666222476163c46c06d2b14.zip | |
Merge branch 'bjorn/asn1/fix-default-values/OTP-11319' into maint
* bjorn/asn1/fix-default-values/OTP-11319:
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 |