Unverified Commit 41acaebb authored by Chadwick Strange's avatar Chadwick Strange

Merge branch 'develop' into enhancement/documentation

parents 479b2abb 5fd5d025
...@@ -20,7 +20,7 @@ COPY m4 ./m4 ...@@ -20,7 +20,7 @@ COPY m4 ./m4
COPY scripts ./scripts COPY scripts ./scripts
COPY secure_enclave ./secure_enclave COPY secure_enclave ./secure_enclave
COPY spdlog ./spdlog COPY spdlog ./spdlog
COPY SGXWALLET_VERSION ./
RUN autoreconf -vif RUN autoreconf -vif
RUN libtoolize --force RUN libtoolize --force
......
...@@ -19,6 +19,7 @@ COPY m4 ./m4 ...@@ -19,6 +19,7 @@ COPY m4 ./m4
COPY scripts ./scripts COPY scripts ./scripts
COPY secure_enclave ./secure_enclave COPY secure_enclave ./secure_enclave
COPY spdlog ./spdlog COPY spdlog ./spdlog
COPY SGXWALLET_VERSION ./
RUN autoreconf -vif RUN autoreconf -vif
RUN libtoolize --force RUN libtoolize --force
......
---
exclude_paths:
- 'scripts/**'
- '.github/**'
This diff is collapsed.
...@@ -6532,7 +6532,7 @@ void signature_copy(signature R, signature sig); ...@@ -6532,7 +6532,7 @@ void signature_copy(signature R, signature sig);
_Bool signature_cmp(signature sig1, signature sig2); _Bool signature_cmp(signature sig1, signature sig2);
void signature_clear(signature sig); void signature_free(signature sig);
void signature_generate_key(point public_key, mpz_t private_key, domain_parameters curve); void signature_generate_key(point public_key, mpz_t private_key, domain_parameters curve);
......
This diff is collapsed.
...@@ -53,10 +53,10 @@ void signature_copy(signature R, signature sig); ...@@ -53,10 +53,10 @@ void signature_copy(signature R, signature sig);
bool signature_cmp(signature sig1, signature sig2); bool signature_cmp(signature sig1, signature sig2);
/*Release signature*/ /*Release signature*/
void signature_clear(signature sig); void signature_free(signature sig);
/*Generates a public key for a private key*/ /*Generates a public key for a private key*/
void signature_generate_key(point public_key, mpz_t private_key, domain_parameters curve); void signature_extract_public_key(point public_key, mpz_t private_key, domain_parameters curve);
/*Generate signature for a message*/ /*Generate signature for a message*/
void signature_sign(signature sig, mpz_t message, mpz_t private_key, domain_parameters curve); void signature_sign(signature sig, mpz_t message, mpz_t private_key, domain_parameters curve);
......
...@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) { ...@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
is_sgx_https = 0; is_sgx_https = 0;
break; break;
case 'a': case 'a':
is_aes = 0; is_aes = 1;
break; break;
case 'b': case 'b':
SEK_initializer = enter_SEK; SEK_initializer = enter_SEK;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment