ltc sync

5 files changed, 10 insertions, 7 deletions

diff --git a/src/ltc/pk/asn1/der/integer/der_length_integer.c b/src/ltc/pk/asn1/der/integer/der_length_integer.c
index b8ff463a..61584f7d 100644
--- a/src/ltc/pk/asn1/der/integer/der_length_integer.c
+++ b/src/ltc/pk/asn1/der/integer/der_length_integer.c
@@ -46,7 +46,6 @@ int der_length_integer(void *num, unsigned long *outlen)
    } else {
       /* it's negative */
       /* find power of 2 that is a multiple of eight and greater than count bits */
-      leading_zero = 0;
       z = mp_count_bits(num);
       z = z + (8 - (z & 7));
       if (((mp_cnt_lsb(num)+1)==mp_count_bits(num)) && ((mp_count_bits(num)&7)==0)) --z;
diff --git a/src/ltc/pk/asn1/der/sequence/der_decode_sequence_multi.c b/src/ltc/pk/asn1/der/sequence/der_decode_sequence_multi.c
index f22ff804..8fa4ae0e 100644
--- a/src/ltc/pk/asn1/der/sequence/der_decode_sequence_multi.c
+++ b/src/ltc/pk/asn1/der/sequence/der_decode_sequence_multi.c
@@ -44,6 +44,8 @@ int der_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...)
        type = va_arg(args, ltc_asn1_type);
        size = va_arg(args, unsigned long);
        data = va_arg(args, void*);
+       LTC_UNUSED_PARAM(size);
+       LTC_UNUSED_PARAM(data);
 
        if (type == LTC_ASN1_EOL) {
           break;
diff --git a/src/ltc/pk/asn1/der/sequence/der_encode_sequence_multi.c b/src/ltc/pk/asn1/der/sequence/der_encode_sequence_multi.c
index 1ffcfce8..cf17f7fa 100644
--- a/src/ltc/pk/asn1/der/sequence/der_encode_sequence_multi.c
+++ b/src/ltc/pk/asn1/der/sequence/der_encode_sequence_multi.c
@@ -45,6 +45,8 @@ int der_encode_sequence_multi(unsigned char *out, unsigned long *outlen, ...)
        type = va_arg(args, ltc_asn1_type);
        size = va_arg(args, unsigned long);
        data = va_arg(args, void*);
+       LTC_UNUSED_PARAM(size);
+       LTC_UNUSED_PARAM(data);
 
        if (type == LTC_ASN1_EOL) {
           break;
diff --git a/src/ltc/pk/asn1/der/sequence/der_encode_subject_public_key_info.c b/src/ltc/pk/asn1/der/sequence/der_encode_subject_public_key_info.c
index 681a53fb..2a738644 100644
--- a/src/ltc/pk/asn1/der/sequence/der_encode_subject_public_key_info.c
+++ b/src/ltc/pk/asn1/der/sequence/der_encode_subject_public_key_info.c
@@ -50,7 +50,7 @@ int der_encode_subject_public_key_info(unsigned char *out, unsigned long *outlen
    }
 
    LTC_SET_ASN1(alg_id, 0, LTC_ASN1_OBJECT_IDENTIFIER, oid.OID,    oid.OIDlen);
-   LTC_SET_ASN1(alg_id, 1, parameters_type,            parameters, parameters_len);
+   LTC_SET_ASN1(alg_id, 1, (ltc_asn1_type)parameters_type,            parameters, parameters_len);
 
    return der_encode_sequence_multi(out, outlen,
         LTC_ASN1_SEQUENCE, (unsigned long)sizeof(alg_id)/sizeof(alg_id[0]), alg_id,
diff --git a/src/ltc/pk/asn1/der/utctime/der_encode_utctime.c b/src/ltc/pk/asn1/der/utctime/der_encode_utctime.c
index f8d0c565..92fffe5e 100644
--- a/src/ltc/pk/asn1/der/utctime/der_encode_utctime.c
+++ b/src/ltc/pk/asn1/der/utctime/der_encode_utctime.c
@@ -17,7 +17,7 @@
 
 #ifdef LTC_DER
 
-static const char *baseten = "0123456789";
+static const char * const baseten = "0123456789";
 
 #define STORE_V(y) \
     out[x++] = der_ia5_char_encode(baseten[(y/10) % 10]); \
@@ -30,12 +30,12 @@ static const char *baseten = "0123456789";
   @param outlen       [in/out] The length of the DER encoding
   @return CRYPT_OK if successful
 */
-int der_encode_utctime(ltc_utctime *utctime, 
+int der_encode_utctime(ltc_utctime *utctime,
                        unsigned char *out,   unsigned long *outlen)
 {
     unsigned long x, tmplen;
     int           err;
- 
+
     LTC_ARGCHK(utctime != NULL);
     LTC_ARGCHK(out     != NULL);
     LTC_ARGCHK(outlen  != NULL);
@@ -47,7 +47,7 @@ int der_encode_utctime(ltc_utctime *utctime,
         *outlen = tmplen;
         return CRYPT_BUFFER_OVERFLOW;
     }
-    
+
     /* store header */
     out[0] = 0x17;
 
@@ -70,7 +70,7 @@ int der_encode_utctime(ltc_utctime *utctime,
 
     /* store length */
     out[1] = (unsigned char)(x - 2);
-   
+
     /* all good let's return */
     *outlen = x;
     return CRYPT_OK;