@@ -41,11 +41,11 @@ bitStringLength: (size_t)bitStringLength { self = [super init]; @try { - if ([bitStringValue count] * [bitStringValue itemSize] != + if (bitStringValue.count * bitStringValue.itemSize != bitStringLength / 8) @throw [OFInvalidFormatException exception]; _bitStringValue = [bitStringValue copy]; _bitStringLength = bitStringLength; @@ -66,17 +66,17 @@ OFData *bitStringValue; size_t bitStringLength; @try { unsigned char lastByteBits; - size_t count = [DEREncodedContents count]; + size_t count = DEREncodedContents.count; if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || tagNumber != OF_ASN1_TAG_NUMBER_BIT_STRING || constructed) @throw [OFInvalidArgumentException exception]; - if ([DEREncodedContents itemSize] != 1 || count == 0) + if (DEREncodedContents.itemSize != 1 || count == 0) @throw [OFInvalidFormatException exception]; lastByteBits = *(unsigned char *)[DEREncodedContents itemAtIndex: 0]; @@ -132,14 +132,14 @@ return true; } - (uint32_t)hash { - return [_bitStringValue hash] + (uint32_t)_bitStringLength; + return _bitStringValue.hash + (uint32_t)_bitStringLength; } - (OFString *)description { return [OFString stringWithFormat: @"", _bitStringValue, _bitStringLength]; } @end