[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/6] pki_gcrypt: Generalize asn1_get_int
[Thread Prev] | [Thread Next]
- Subject: [PATCH 3/6] pki_gcrypt: Generalize asn1_get_int
- From: Justus Winter <justus@xxxxxxxxxxx>
- Reply-to: libssh@xxxxxxxxxx
- Date: Mon, 14 Mar 2016 16:31:59 +0100
- To: libssh@xxxxxxxxxx
- Cc: Justus Winter <justus@xxxxxxxxxxx>
* src/pki_gcrypt.c (asn1_get): Generalize from 'asn1_get_int'.
(asn1_get_int): New function simply calling 'asn1_get'.
Signed-off-by: Justus Winter <justus@xxxxxxxxxxx>
---
src/pki_gcrypt.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c
index d75223f..b901ea9 100644
--- a/src/pki_gcrypt.c
+++ b/src/pki_gcrypt.c
@@ -112,12 +112,12 @@ static uint32_t asn1_get_len(ssh_buffer buffer) {
return len;
}
-static ssh_string asn1_get_int(ssh_buffer buffer) {
+static ssh_string asn1_get(ssh_buffer buffer, unsigned char want) {
ssh_string str;
unsigned char type;
uint32_t size;
- if (ssh_buffer_get_data(buffer, &type, 1) == 0 || type != ASN1_INTEGER) {
+ if (ssh_buffer_get_data(buffer, &type, 1) == 0 || type != want) {
return NULL;
}
size = asn1_get_len(buffer);
@@ -138,6 +138,10 @@ static ssh_string asn1_get_int(ssh_buffer buffer) {
return str;
}
+static ssh_string asn1_get_int(ssh_buffer buffer) {
+ return asn1_get(buffer, ASN1_INTEGER);
+}
+
static int asn1_check_sequence(ssh_buffer buffer) {
unsigned char *j = NULL;
unsigned char tmp;
--
2.1.4
| [PATCH 1/6] torture: Fix guard | Justus Winter <justus@xxxxxxxxxxx> |