X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fecdsa.c;h=43464d8835b60c9c37280c682b14e2696965d5f3;hb=bbeab00f46a6c856573fe0d2b9b85bce35728403;hp=84fe8fd93ce1c55d40823ebeb0b2c41bdf4db8d6;hpb=95e1cc36d320b47408ac3ec6f89df54e55a010d4;p=tinc

diff --git a/src/openssl/ecdsa.c b/src/openssl/ecdsa.c
index 84fe8fd9..43464d88 100644
--- a/src/openssl/ecdsa.c
+++ b/src/openssl/ecdsa.c
@@ -26,8 +26,8 @@
 #include "ecdsa.h"
 #include "utils.h"
 
-// Set ECDSA keys
-
+// Get and set ECDSA keys
+//
 bool ecdsa_set_base64_public_key(ecdsa_t *ecdsa, const char *p) {
 	*ecdsa = EC_KEY_new_by_curve_name(NID_secp521r1);
 
@@ -44,6 +44,18 @@ bool ecdsa_set_base64_public_key(ecdsa_t *ecdsa, const char *p) {
 	return true;
 }
 
+char *ecdsa_get_base64_public_key(ecdsa_t *ecdsa) {
+	unsigned char *pubkey = NULL;
+	int len = i2o_ECPublicKey(*ecdsa, &pubkey);
+
+	char *base64 = malloc(len * 4 / 3 + 5);
+	b64encode(pubkey, base64, len);
+
+	free(pubkey);
+
+	return base64;
+}
+
 // Read PEM ECDSA keys
 
 bool ecdsa_read_pem_public_key(ecdsa_t *ecdsa, FILE *fp) {
@@ -70,12 +82,49 @@ size_t ecdsa_size(ecdsa_t *ecdsa) {
 	return ECDSA_size(*ecdsa);
 }
 
+// TODO: standardise output format?
+
 bool ecdsa_sign(ecdsa_t *ecdsa, const void *in, size_t len, void *sig) {
-	logger(LOG_ERR, "Unable to perform ECDSA signature: %s", ERR_error_string(ERR_get_error(), NULL));
-	return false;	
+	unsigned int siglen = ECDSA_size(*ecdsa);
+
+	char hash[SHA512_DIGEST_LENGTH];
+	SHA512(in, len, hash);
+
+	memset(sig, 0, siglen);
+
+	if(!ECDSA_sign(0, hash, sizeof hash, sig, &siglen, *ecdsa)) {
+		logger(LOG_DEBUG, "ECDSA_sign() failed: %s", ERR_error_string(ERR_get_error(), NULL));
+		return false;
+	}
+
+	if(siglen != ECDSA_size(*ecdsa)) {
+		logger(LOG_ERR, "Signature length %d != %d", siglen, ECDSA_size(*ecdsa));
+	}
+
+	return true;
 }
 
 bool ecdsa_verify(ecdsa_t *ecdsa, const void *in, size_t len, const void *sig) {
-	logger(LOG_ERR, "Unable to perform ECDSA verification: %s", ERR_error_string(ERR_get_error(), NULL));
-	return false;	
+	unsigned int siglen = ECDSA_size(*ecdsa);
+
+	char hash[SHA512_DIGEST_LENGTH];
+	SHA512(in, len, hash);
+
+	if(!ECDSA_verify(0, hash, sizeof hash, sig, siglen, *ecdsa)) {
+		logger(LOG_DEBUG, "ECDSA_verify() failed: %s", ERR_error_string(ERR_get_error(), NULL));
+		return false;
+	}
+
+	return true;
+}
+
+bool ecdsa_active(ecdsa_t *ecdsa) {
+	return *ecdsa;
+}
+
+void ecdsa_free(ecdsa_t *ecdsa) {
+	if(*ecdsa) {
+		EC_KEY_free(*ecdsa);
+		*ecdsa = NULL;
+	}
 }