summaryrefslogtreecommitdiff
path: root/src/ltc/pk/dsa
diff options
context:
space:
mode:
Diffstat (limited to 'src/ltc/pk/dsa')
-rw-r--r--src/ltc/pk/dsa/dsa_encrypt_key.c6
-rw-r--r--src/ltc/pk/dsa/dsa_export.c2
-rw-r--r--src/ltc/pk/dsa/dsa_free.c2
-rw-r--r--src/ltc/pk/dsa/dsa_generate_pqg.c6
-rw-r--r--src/ltc/pk/dsa/dsa_import.c20
-rw-r--r--src/ltc/pk/dsa/dsa_set.c2
-rw-r--r--src/ltc/pk/dsa/dsa_set_pqg_dsaparam.c2
-rw-r--r--src/ltc/pk/dsa/dsa_sign_hash.c8
-rw-r--r--src/ltc/pk/dsa/dsa_verify_hash.c8
-rw-r--r--src/ltc/pk/dsa/dsa_verify_key.c4
10 files changed, 30 insertions, 30 deletions
diff --git a/src/ltc/pk/dsa/dsa_encrypt_key.c b/src/ltc/pk/dsa/dsa_encrypt_key.c
index c2b7e9d7..2f460921 100644
--- a/src/ltc/pk/dsa/dsa_encrypt_key.c
+++ b/src/ltc/pk/dsa/dsa_encrypt_key.c
@@ -50,7 +50,7 @@ int dsa_encrypt_key(const unsigned char *in, unsigned long inlen,
}
/* make a random key and export the public copy */
- if ((err = mp_init_multi(&g_pub, &g_priv, NULL)) != CRYPT_OK) {
+ if ((err = mp_init_multi(&g_pub, &g_priv, LTC_NULL)) != CRYPT_OK) {
return err;
}
@@ -63,7 +63,7 @@ int dsa_encrypt_key(const unsigned char *in, unsigned long inlen,
if (skey != NULL) {
XFREE(skey);
}
- mp_clear_multi(g_pub, g_priv, NULL);
+ mp_clear_multi(g_pub, g_priv, LTC_NULL);
return CRYPT_MEM;
}
@@ -111,7 +111,7 @@ LBL_ERR:
XFREE(skey);
XFREE(expt);
- mp_clear_multi(g_pub, g_priv, NULL);
+ mp_clear_multi(g_pub, g_priv, LTC_NULL);
return err;
}
diff --git a/src/ltc/pk/dsa/dsa_export.c b/src/ltc/pk/dsa/dsa_export.c
index 8f22ab8a..3550cbec 100644
--- a/src/ltc/pk/dsa/dsa_export.c
+++ b/src/ltc/pk/dsa/dsa_export.c
@@ -75,7 +75,7 @@ int dsa_export(unsigned char *out, unsigned long *outlen, int type, const dsa_ke
LTC_SET_ASN1(int_list, 1, LTC_ASN1_INTEGER, key->q, 1UL);
LTC_SET_ASN1(int_list, 2, LTC_ASN1_INTEGER, key->g, 1UL);
- err = x509_encode_subject_public_key_info(out, outlen, PKA_DSA, tmp,
+ err = x509_encode_subject_public_key_info(out, outlen, LTC_OID_DSA, tmp,
tmplen, LTC_ASN1_SEQUENCE, int_list,
sizeof(int_list) / sizeof(int_list[0]));
diff --git a/src/ltc/pk/dsa/dsa_free.c b/src/ltc/pk/dsa/dsa_free.c
index dc54f57f..dbe86253 100644
--- a/src/ltc/pk/dsa/dsa_free.c
+++ b/src/ltc/pk/dsa/dsa_free.c
@@ -16,7 +16,7 @@
void dsa_free(dsa_key *key)
{
LTC_ARGCHKVD(key != NULL);
- mp_cleanup_multi(&key->y, &key->x, &key->q, &key->g, &key->p, NULL);
+ mp_cleanup_multi(&key->y, &key->x, &key->q, &key->g, &key->p, LTC_NULL);
key->type = key->qord = 0;
}
diff --git a/src/ltc/pk/dsa/dsa_generate_pqg.c b/src/ltc/pk/dsa/dsa_generate_pqg.c
index a2d54382..22f4852b 100644
--- a/src/ltc/pk/dsa/dsa_generate_pqg.c
+++ b/src/ltc/pk/dsa/dsa_generate_pqg.c
@@ -108,7 +108,7 @@ static int s_dsa_make_params(prng_state *prng, int wprng, int group_size, int mo
if ((wbuf = XMALLOC((n+1)*outbytes)) == NULL) { err = CRYPT_MEM; goto cleanup3; }
if ((sbuf = XMALLOC(seedbytes)) == NULL) { err = CRYPT_MEM; goto cleanup2; }
- err = mp_init_multi(&t2L1, &t2N1, &t2q, &t2seedlen, &U, &W, &X, &c, &h, &e, &seedinc, NULL);
+ err = mp_init_multi(&t2L1, &t2N1, &t2q, &t2seedlen, &U, &W, &X, &c, &h, &e, &seedinc, LTC_NULL);
if (err != CRYPT_OK) { goto cleanup1; }
if ((err = mp_2expt(t2L1, L-1)) != CRYPT_OK) { goto cleanup; }
@@ -187,7 +187,7 @@ static int s_dsa_make_params(prng_state *prng, int wprng, int group_size, int mo
err = CRYPT_OK;
cleanup:
- mp_clear_multi(t2L1, t2N1, t2q, t2seedlen, U, W, X, c, h, e, seedinc, NULL);
+ mp_clear_multi(t2L1, t2N1, t2q, t2seedlen, U, W, X, c, h, e, seedinc, LTC_NULL);
cleanup1:
XFREE(sbuf);
cleanup2:
@@ -213,7 +213,7 @@ int dsa_generate_pqg(prng_state *prng, int wprng, int group_size, int modulus_si
LTC_ARGCHK(ltc_mp.name != NULL);
/* init mp_ints */
- if ((err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL)) != CRYPT_OK) {
+ if ((err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, LTC_NULL)) != CRYPT_OK) {
return err;
}
/* generate params */
diff --git a/src/ltc/pk/dsa/dsa_import.c b/src/ltc/pk/dsa/dsa_import.c
index a1d22818..b5660d39 100644
--- a/src/ltc/pk/dsa/dsa_import.c
+++ b/src/ltc/pk/dsa/dsa_import.c
@@ -28,7 +28,7 @@ int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key *key)
LTC_ARGCHK(ltc_mp.name != NULL);
/* init key */
- if (mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL) != CRYPT_OK) {
+ if (mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, LTC_NULL) != CRYPT_OK) {
return CRYPT_MEM;
}
@@ -72,14 +72,14 @@ int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key *key)
}
}
/* get key type */
- if ((err = der_decode_sequence_multi(in, inlen,
- LTC_ASN1_SHORT_INTEGER, 1UL, &zero,
- LTC_ASN1_INTEGER, 1UL, key->p,
- LTC_ASN1_INTEGER, 1UL, key->q,
- LTC_ASN1_INTEGER, 1UL, key->g,
- LTC_ASN1_INTEGER, 1UL, key->y,
- LTC_ASN1_INTEGER, 1UL, key->x,
- LTC_ASN1_EOL, 0UL, NULL)) == CRYPT_OK) {
+ if (der_decode_sequence_multi(in, inlen,
+ LTC_ASN1_SHORT_INTEGER, 1UL, &zero,
+ LTC_ASN1_INTEGER, 1UL, key->p,
+ LTC_ASN1_INTEGER, 1UL, key->q,
+ LTC_ASN1_INTEGER, 1UL, key->g,
+ LTC_ASN1_INTEGER, 1UL, key->y,
+ LTC_ASN1_INTEGER, 1UL, key->x,
+ LTC_ASN1_EOL, 0UL, NULL) == CRYPT_OK) {
key->type = PK_PRIVATE;
} else { /* public */
@@ -97,7 +97,7 @@ int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key *key)
}
len = 3;
- err = x509_decode_subject_public_key_info(in, inlen, PKA_DSA,
+ err = x509_decode_subject_public_key_info(in, inlen, LTC_OID_DSA,
tmpbuf, &tmpbuf_len,
LTC_ASN1_SEQUENCE, params, &len);
if (err != CRYPT_OK) {
diff --git a/src/ltc/pk/dsa/dsa_set.c b/src/ltc/pk/dsa/dsa_set.c
index 026f2806..82b60333 100644
--- a/src/ltc/pk/dsa/dsa_set.c
+++ b/src/ltc/pk/dsa/dsa_set.c
@@ -30,7 +30,7 @@ int dsa_set_pqg(const unsigned char *p, unsigned long plen,
LTC_ARGCHK(ltc_mp.name != NULL);
/* init key */
- err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL);
+ err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, LTC_NULL);
if (err != CRYPT_OK) return err;
if ((err = mp_read_unsigned_bin(key->p, (unsigned char *)p , plen)) != CRYPT_OK) { goto LBL_ERR; }
diff --git a/src/ltc/pk/dsa/dsa_set_pqg_dsaparam.c b/src/ltc/pk/dsa/dsa_set_pqg_dsaparam.c
index 3ab92282..97c71f10 100644
--- a/src/ltc/pk/dsa/dsa_set_pqg_dsaparam.c
+++ b/src/ltc/pk/dsa/dsa_set_pqg_dsaparam.c
@@ -25,7 +25,7 @@ int dsa_set_pqg_dsaparam(const unsigned char *dsaparam, unsigned long dsaparamle
LTC_ARGCHK(ltc_mp.name != NULL);
/* init key */
- err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL);
+ err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, LTC_NULL);
if (err != CRYPT_OK) return err;
if ((err = der_decode_sequence_multi(dsaparam, dsaparamlen,
diff --git a/src/ltc/pk/dsa/dsa_sign_hash.c b/src/ltc/pk/dsa/dsa_sign_hash.c
index c4ba0bc1..56baa803 100644
--- a/src/ltc/pk/dsa/dsa_sign_hash.c
+++ b/src/ltc/pk/dsa/dsa_sign_hash.c
@@ -51,7 +51,7 @@ int dsa_sign_hash_raw(const unsigned char *in, unsigned long inlen,
}
/* Init our temps */
- if ((err = mp_init_multi(&k, &kinv, &tmp, NULL)) != CRYPT_OK) { goto ERRBUF; }
+ if ((err = mp_init_multi(&k, &kinv, &tmp, LTC_NULL)) != CRYPT_OK) { goto ERRBUF; }
qbits = mp_count_bits(key->q);
retry:
@@ -89,7 +89,7 @@ retry:
err = CRYPT_OK;
error:
- mp_clear_multi(k, kinv, tmp, NULL);
+ mp_clear_multi(k, kinv, tmp, LTC_NULL);
ERRBUF:
#ifdef LTC_CLEAN_STACK
zeromem(buf, LTC_MDSA_MAX_GROUP);
@@ -121,7 +121,7 @@ int dsa_sign_hash(const unsigned char *in, unsigned long inlen,
LTC_ARGCHK(outlen != NULL);
LTC_ARGCHK(key != NULL);
- if (mp_init_multi(&r, &s, NULL) != CRYPT_OK) {
+ if (mp_init_multi(&r, &s, LTC_NULL) != CRYPT_OK) {
return CRYPT_MEM;
}
@@ -135,7 +135,7 @@ int dsa_sign_hash(const unsigned char *in, unsigned long inlen,
LTC_ASN1_EOL, 0UL, NULL);
error:
- mp_clear_multi(r, s, NULL);
+ mp_clear_multi(r, s, LTC_NULL);
return err;
}
diff --git a/src/ltc/pk/dsa/dsa_verify_hash.c b/src/ltc/pk/dsa/dsa_verify_hash.c
index e290ba16..500feda9 100644
--- a/src/ltc/pk/dsa/dsa_verify_hash.c
+++ b/src/ltc/pk/dsa/dsa_verify_hash.c
@@ -36,7 +36,7 @@ int dsa_verify_hash_raw( void *r, void *s,
*stat = 0;
/* init our variables */
- if ((err = mp_init_multi(&w, &v, &u1, &u2, NULL)) != CRYPT_OK) {
+ if ((err = mp_init_multi(&w, &v, &u1, &u2, LTC_NULL)) != CRYPT_OK) {
return err;
}
@@ -72,7 +72,7 @@ int dsa_verify_hash_raw( void *r, void *s,
err = CRYPT_OK;
error:
- mp_clear_multi(w, v, u1, u2, NULL);
+ mp_clear_multi(w, v, u1, u2, LTC_NULL);
return err;
}
@@ -98,7 +98,7 @@ int dsa_verify_hash(const unsigned char *sig, unsigned long siglen,
LTC_ARGCHK(stat != NULL);
*stat = 0; /* must be set before the first return */
- if ((err = mp_init_multi(&r, &s, NULL)) != CRYPT_OK) {
+ if ((err = mp_init_multi(&r, &s, LTC_NULL)) != CRYPT_OK) {
return err;
}
@@ -119,7 +119,7 @@ int dsa_verify_hash(const unsigned char *sig, unsigned long siglen,
err = dsa_verify_hash_raw(r, s, hash, hashlen, stat, key);
LBL_ERR:
- mp_clear_multi(r, s, NULL);
+ mp_clear_multi(r, s, LTC_NULL);
return err;
}
diff --git a/src/ltc/pk/dsa/dsa_verify_key.c b/src/ltc/pk/dsa/dsa_verify_key.c
index 4f4bdd17..50d566ae 100644
--- a/src/ltc/pk/dsa/dsa_verify_key.c
+++ b/src/ltc/pk/dsa/dsa_verify_key.c
@@ -62,7 +62,7 @@ int dsa_int_validate_pqg(const dsa_key *key, int *stat)
return CRYPT_OK;
}
- if ((err = mp_init_multi(&tmp1, &tmp2, NULL)) != CRYPT_OK) { return err; }
+ if ((err = mp_init_multi(&tmp1, &tmp2, LTC_NULL)) != CRYPT_OK) { return err; }
/* FIPS 186-4 chapter 4.1: q is a divisor of (p - 1) */
if ((err = mp_sub_d(key->p, 1, tmp1)) != CRYPT_OK) { goto error; }
@@ -84,7 +84,7 @@ int dsa_int_validate_pqg(const dsa_key *key, int *stat)
err = CRYPT_OK;
*stat = 1;
error:
- mp_clear_multi(tmp2, tmp1, NULL);
+ mp_clear_multi(tmp2, tmp1, LTC_NULL);
return err;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 03:50:13 +0000