Unverified Commit 46a941ee authored by Raghav Sood's avatar Raghav Sood Committed by GitHub
Browse files

Merge pull request #310878 from RaghavSood/ecdsatool/fixbuild

ecdsatool: fix build
parents 1e29d63f 0a9fb0a1
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
diff --git a/libecdsaauth/base64.c b/libecdsaauth/base64.c
index 0f9b7a3..84df22a 100644
--- a/libecdsaauth/base64.c
+++ b/libecdsaauth/base64.c
@@ -45,6 +45,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#include <ctype.h>
 
 static const char Base64[] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ stdenv.mkDerivation {
    ./configure --prefix=$out
  '';

  patches = [
    ./ctype-header-c99-implicit-function-declaration.patch
    ./openssl-header-c99-implicit-function-declaration.patch
  ];

  nativeBuildInputs = with pkgs; [openssl autoconf automake];
  buildInputs = with pkgs; [libuecc];

+33 −0
Original line number Diff line number Diff line
diff --git a/libecdsaauth/keypair.c b/libecdsaauth/keypair.c
index 5e098c5..b5dd21e 100644
--- a/libecdsaauth/keypair.c
+++ b/libecdsaauth/keypair.c
@@ -22,6 +22,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <openssl/pem.h>
 
 static inline libecdsaauth_key_t *libecdsaauth_key_alloc(void)
 {
diff --git a/tool/main.c b/tool/main.c
index 23d19a3..f88016c 100644
--- a/tool/main.c
+++ b/tool/main.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/pem.h>
 
 #include "libecdsaauth/keypair.h"
 #include "libecdsaauth/op.h"
@@ -41,7 +42,7 @@ static int tool_keygen(int argc, const char *argv[])
 	key = libecdsaauth_key_new();
 
 	pubout = fopen(argv[1], "w");
-	PEM_write_ECPrivateKey(pubout, key->eckey, NULL, NULL, 0, NULL);
+	PEM_write_ECPrivateKey(pubout, key->eckey, NULL, NULL, 0, NULL, NULL);
 	fclose(pubout);
 
 	pubkey = libecdsaauth_key_public_key_base64(key);