Mercurial Mercurial > relpipe > relpipe-in-asn1table.cpp / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/lib/BasicASN1Reader.h
branchv_0
changeset 27 d9cc2d356cdb
parent 26 e39de9b8b3a1
child 28 fade2f562970
equal deleted inserted replaced
26:e39de9b8b3a1 27:d9cc2d356cdb 
   137 			handlers.writeCollectionStart(typeHeader);
 
   137 			handlers.writeCollectionStart(typeHeader);
 
   138 		} else if (typeHeader.pc == PC::Constructed) {
 
   138 		} else if (typeHeader.pc == PC::Constructed) {
 
   139 			level.push_back({typeHeader.definiteLength, typeHeader.length, getBytesRead()}); // TODO: transaction
 
   139 			level.push_back({typeHeader.definiteLength, typeHeader.length, getBytesRead()}); // TODO: transaction
 
   140 			handlers.writeCollectionStart(typeHeader);
 
   140 			handlers.writeCollectionStart(typeHeader);
 
   141 		} else if (typeHeader.tag == UniversalType::Null && typeHeader.length == 0) {
 
   141 		} else if (typeHeader.tag == UniversalType::Null && typeHeader.length == 0) {
 
   142 			handlers.writeNull();
 
   142 			handlers.writeNull(typeHeader);
 
   143 		} else if (typeHeader.tag == UniversalType::Boolean && typeHeader.definiteLength && typeHeader.length == 1) {
 
   143 		} else if (typeHeader.tag == UniversalType::Boolean && typeHeader.definiteLength && typeHeader.length == 1) {
 
   144 			bool value;
 
   144 			bool value;
 
   145 			read((uint8_t*) & value, 1);
 
   145 			read((uint8_t*) & value, 1);
 
   146 			handlers.writeBoolean(value);
 
   146 			handlers.writeBoolean(typeHeader, value);
 
   147 		} else if (typeHeader.tag == UniversalType::Integer && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   147 		} else if (typeHeader.tag == UniversalType::Integer && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   148 			// TODO: check available bytes before allocating buffer
 
   148 			// TODO: check available bytes before allocating buffer
 
   149 			std::vector<uint8_t> value(typeHeader.length, 0x00);
 
   149 			std::vector<uint8_t> value(typeHeader.length, 0x00);
 
   150 			read(value.data(), typeHeader.length);
 
   150 			read(value.data(), typeHeader.length);
 
   151 			handlers.writeInteger(ASN1ContentHandler::Integer(value));
 
   151 			handlers.writeInteger(typeHeader, ASN1ContentHandler::Integer(value));
 
   152 		} else if (typeHeader.tag == UniversalType::ObjectIdentifier && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   152 		} else if (typeHeader.tag == UniversalType::ObjectIdentifier && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   153 			std::vector<uint8_t> value(typeHeader.length, 0x00);
 
   153 			std::vector<uint8_t> value(typeHeader.length, 0x00);
 
   154 			read(value.data(), typeHeader.length);
 
   154 			read(value.data(), typeHeader.length);
 
   155 			handlers.writeOID({value});
 
   155 			handlers.writeOID(typeHeader,{value});
 
   156 		} else if (typeHeader.tag == UniversalType::UTF8String && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   156 		} else if (typeHeader.tag == UniversalType::UTF8String && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   157 			// TODO: check available bytes before allocating buffer
 
   157 			// TODO: check available bytes before allocating buffer
 
   158 			std::string s;
 
   158 			std::string s;
 
   159 			s.resize(typeHeader.length);
 
   159 			s.resize(typeHeader.length);
 
   160 			read((uint8_t*) s.data(), typeHeader.length);
 
   160 			read((uint8_t*) s.data(), typeHeader.length);
 
   161 			handlers.writeTextString(ASN1ContentHandler::StringType::UTF8String, s);
 
   161 			handlers.writeTextString(typeHeader, s);
 
   162 		} else if (typeHeader.tag == UniversalType::PrintableString && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   162 		} else if (typeHeader.tag == UniversalType::PrintableString && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   163 			// TODO: check encoding
 
   163 			// TODO: check encoding
 
   164 			// TODO: check available bytes before allocating buffer
 
   164 			// TODO: check available bytes before allocating buffer
 
   165 			std::string s;
 
   165 			std::string s;
 
   166 			s.resize(typeHeader.length);
 
   166 			s.resize(typeHeader.length);
 
   167 			read((uint8_t*) s.data(), typeHeader.length);
 
   167 			read((uint8_t*) s.data(), typeHeader.length);
 
   168 			handlers.writeTextString(ASN1ContentHandler::StringType::PrintableString, s);
 
   168 			handlers.writeTextString(typeHeader, s);
 
   169 		} else if (typeHeader.tag == UniversalType::OctetString && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   169 		} else if (typeHeader.tag == UniversalType::OctetString && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   170 			// TODO: check available bytes before allocating buffer
 
   170 			// TODO: check available bytes before allocating buffer
 
   171 			std::string s;
 
   171 			std::string s;
 
   172 			s.resize(typeHeader.length);
 
   172 			s.resize(typeHeader.length);
 
   173 			read((uint8_t*) s.data(), typeHeader.length);
 
   173 			read((uint8_t*) s.data(), typeHeader.length);
 
   174 			handlers.writeOctetString(s);
 
   174 			handlers.writeOctetString(typeHeader, s);
 
   175 		} else if (typeHeader.tag == UniversalType::BitString && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   175 		} else if (typeHeader.tag == UniversalType::BitString && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   176 			// TODO: check available bytes before allocating buffer
 
   176 			// TODO: check available bytes before allocating buffer
 
   177 			std::string s;
 
   177 			std::string s;
 
   178 			s.resize(typeHeader.length);
 
   178 			s.resize(typeHeader.length);
 
   179 			read((uint8_t*) s.data(), typeHeader.length);
 
   179 			read((uint8_t*) s.data(), typeHeader.length);
 
   182 			if (s.size() > 1) {
 
   182 			if (s.size() > 1) {
 
   183 				uint8_t padding = s[0];
 
   183 				uint8_t padding = s[0];
 
   184 				for (uint8_t j = padding; j < 8; j++) bits.push_back(s.back() & 1 << j);
 
   184 				for (uint8_t j = padding; j < 8; j++) bits.push_back(s.back() & 1 << j);
 
   185 				for (size_t i = s.size() - 2; i > 0; i--) for (uint8_t j = 0; j < 8; j++) bits.push_back(s[i] & 1 << j);
 
   185 				for (size_t i = s.size() - 2; i > 0; i--) for (uint8_t j = 0; j < 8; j++) bits.push_back(s[i] & 1 << j);
 
   186 			}
 
   186 			}
 
   187 			handlers.writeBitString(bits);
 
   187 			handlers.writeBitString(typeHeader, bits);
 
   188 		} else if (typeHeader.tag == UniversalType::UTCTime && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   188 		} else if (typeHeader.tag == UniversalType::UTCTime && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   189 			// TODO: check available bytes before allocating buffer
 
   189 			// TODO: check available bytes before allocating buffer
 
   190 			// TODO: check encoding
 
   190 			// TODO: check encoding
 
   191 			std::string s;
 
   191 			std::string s;
 
   192 			s.resize(typeHeader.length);
 
   192 			s.resize(typeHeader.length);
 
   214 				dateTime.second = match[i].length() ? std::stoi(match[i++]) : 0;
 
   214 				dateTime.second = match[i].length() ? std::stoi(match[i++]) : 0;
 
   215 				if (match[i++] != "Z") {
 
   215 				if (match[i++] != "Z") {
 
   216 					dateTime.timezoneHour = std::stoi(match[i++]);
 
   216 					dateTime.timezoneHour = std::stoi(match[i++]);
 
   217 					dateTime.timezoneMinute = std::stoi(match[i++]);
 
   217 					dateTime.timezoneMinute = std::stoi(match[i++]);
 
   218 				}
 
   218 				}
 
   219 				handlers.writeDateTime(ASN1ContentHandler::DateTimeType::UTCTime, dateTime);
 
   219 				handlers.writeDateTime(typeHeader, dateTime);
 
   220 			} else {
 
   220 			} else {
 
   221 				throw std::invalid_argument("Unsupported UTCTime format: " + s); // TODO: better exception
 
   221 				throw std::invalid_argument("Unsupported UTCTime format: " + s); // TODO: better exception
 
   222 			}
 
   222 			}
 
   223 
   223 
   224 		} else if (typeHeader.tag == UniversalType::GeneralizedTime && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   224 		} else if (typeHeader.tag == UniversalType::GeneralizedTime && typeHeader.tagClass == TagClass::Universal && typeHeader.definiteLength) {
 
   245 				else i++;
 
   245 				else i++;
 
   246 				if (match[i++] != "Z") {
 
   246 				if (match[i++] != "Z") {
 
   247 					dateTime.timezoneHour = std::stoi(match[i++]);
 
   247 					dateTime.timezoneHour = std::stoi(match[i++]);
 
   248 					dateTime.timezoneMinute = std::stoi(match[i++]);
 
   248 					dateTime.timezoneMinute = std::stoi(match[i++]);
 
   249 				}
 
   249 				}
 
   250 				handlers.writeDateTime(ASN1ContentHandler::DateTimeType::GeneralizedTime, dateTime);
 
   250 				handlers.writeDateTime(typeHeader, dateTime);
 
   251 			} else {
 
   251 			} else {
 
   252 				throw std::invalid_argument("Unsupported GeneralizedTime format: " + s); // TODO: better exception
 
   252 				throw std::invalid_argument("Unsupported GeneralizedTime format: " + s); // TODO: better exception
 
   253 			}
 
   253 			}
 
   254 
   254 
   255 		} else {
 
   255 		} else {
 
   264 					<< " tagClass = " << (int) typeHeader.tagClass
 
   264 					<< " tagClass = " << (int) typeHeader.tagClass
 
   265 					<< " pc = " << (int) typeHeader.pc
 
   265 					<< " pc = " << (int) typeHeader.pc
 
   266 					<< " length = " << typeHeader.length
 
   266 					<< " length = " << typeHeader.length
 
   267 					<< " definite = " << (typeHeader.definiteLength ? "true" : "false");
 
   267 					<< " definite = " << (typeHeader.definiteLength ? "true" : "false");
 
   268 
   268 
   269 			handlers.writeTextString(ASN1ContentHandler::StringType::UTF8String, description.str());
 
   269 			handlers.writeTextString(typeHeader, description.str());
 
   270 		}
 
   270 		}
 
   271 
   271 
   272 		commit();
 
   272 		commit();
 
   273 	}
 
   273 	}
 
   274 
   274
relpipe/relpipe-in-asn1table.cpp