From bfedbb3f3bd397d869e4f5e8a1834cdbfdca4330 Mon Sep 17 00:00:00 2001
From: Dmitriy Musatkin <musatkd@amazon.com>
Date: Mon, 9 Oct 2023 09:28:05 -0700
Subject: [PATCH] naming update

---
 source/rsa.c     | 22 +++++++++++-----------
 tests/der_test.c |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/rsa.c b/source/rsa.c
index a894e75a..fd7313eb 100644
--- a/source/rsa.c
+++ b/source/rsa.c
@@ -211,7 +211,7 @@ int aws_der_decoder_load_private_rsa_pkcs1(struct aws_der_decoder *decoder, stru
     }
 
     struct aws_byte_cursor version_cur;
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &version_cur)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &version_cur)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
@@ -220,35 +220,35 @@ int aws_der_decoder_load_private_rsa_pkcs1(struct aws_der_decoder *decoder, stru
     }
     out->version = 0;
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &(out->modulus))) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &(out->modulus))) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->publicExponent)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->publicExponent)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->privateExponent)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->privateExponent)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->prime1)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->prime1)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->prime2)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->prime2)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->exponent1)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->exponent1)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->exponent2)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->exponent2)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->coefficient)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->coefficient)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
@@ -260,11 +260,11 @@ int aws_der_decoder_load_public_rsa_pkcs1(struct aws_der_decoder *decoder, struc
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &(out->modulus))) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &(out->modulus))) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
-    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_integer(decoder, &out->publicExponent)) {
+    if (!aws_der_decoder_next(decoder) || aws_der_decoder_tlv_unsigned_integer(decoder, &out->publicExponent)) {
         return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
     }
 
diff --git a/tests/der_test.c b/tests/der_test.c
index e8f1d867..6df45b28 100644
--- a/tests/der_test.c
+++ b/tests/der_test.c
@@ -325,7 +325,7 @@ static int s_der_decode_integer_zero(struct aws_allocator *allocator, void *ctx)
     ASSERT_INT_EQUALS(AWS_DER_INTEGER, aws_der_decoder_tlv_type(decoder));
     ASSERT_INT_EQUALS(decoded_size, aws_der_decoder_tlv_length(decoder));
     struct aws_byte_cursor decoded;
-    ASSERT_SUCCESS(aws_der_decoder_tlv_integer(decoder, &decoded));
+    ASSERT_SUCCESS(aws_der_decoder_tlv_unsigned_integer(decoder, &decoded));
     ASSERT_BIN_ARRAYS_EQUALS(s_bigint_zero, decoded_size, decoded.ptr, decoded.len);
     ASSERT_FALSE(aws_der_decoder_next(decoder));
     aws_der_decoder_destroy(decoder);