From 38d8befcd0781864f8f923ae0b1f7cb2731e900d Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 14 Mar 2016 16:31:59 +0100 Subject: [PATCH] pki_gcrypt: Generalize asn1_get_int * 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 Reviewed-by: Andreas Schneider --- 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 e7e92919..22806af3 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;