Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -9089,6 +9089,7 @@ else
/* end confdefs.h. */

#include <stdio.h>
#include <stdlib.h>
int main(){exit(0);}

_ACEOF
Expand Down Expand Up @@ -11211,6 +11212,7 @@ else
/* end confdefs.h. */

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <openssl/opensslv.h>
#define DATA "conftest.sslincver"
Expand Down Expand Up @@ -11323,6 +11325,8 @@ else
/* end confdefs.h. */

#include <string.h>
#include <stdlib.h>
#include <openssl/crypto.h>
#include <openssl/opensslv.h>
int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }

Expand Down Expand Up @@ -13841,6 +13845,7 @@ else
/* end confdefs.h. */

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_SNPRINTF
main()
Expand Down Expand Up @@ -14839,6 +14844,8 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

#include <stdio.h>

int
main ()
{
Expand Down
8 changes: 8 additions & 0 deletions key.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@
#include <openssl/ecdsa.h>
#include "ed25519-donna/ed25519.h"

#ifndef u_char
typedef unsigned char u_char;
#endif

#ifndef u_int
typedef unsigned int u_int;
#endif

typedef struct Key Key;
enum types {
KEY_RSA1,
Expand Down
4 changes: 2 additions & 2 deletions openbsd-compat/bsd-snprintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -827,15 +827,15 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen,
}
#endif /* !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) */

#if !defined(HAVE_VSNPRINTF)
#ifndef vsnprintf
int
vsnprintf (char *str, size_t count, const char *fmt, va_list args)
{
return dopr(str, count, fmt, args);
}
#endif

#if !defined(HAVE_SNPRINTF)
#ifndef snprintf
int
snprintf(char *str, size_t count, SNPRINTF_CONST char *fmt, ...)
{
Expand Down