sodium no longer provides crypto_uint*, so provide ones local.


(joerg)

$NetBSD: patch-libcurvecpr-glib_include_curvecpr__glib_client__messager__glib.h,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr-glib/include/curvecpr_glib/client_messager_glib.h.orig	2019-12-22 17:54:41.079631695 +0000
+++ libcurvecpr-glib/include/curvecpr_glib/client_messager_glib.h
@@ -4,12 +4,11 @@
 #include "messager_glib.h"
 
 #include <curvecpr/block.h>
+#include <curvecpr/bytes.h>
 #include <curvecpr/client.h>
 
 #include <string.h>
 
-#include <sodium/crypto_uint64.h>
-
 struct curvecpr_client_messager_glib;
 
 struct curvecpr_client_messager_glib_ops {

$NetBSD: patch-libcurvecpr-glib_include_curvecpr__glib_messager__glib.h,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr-glib/include/curvecpr_glib/messager_glib.h.orig	2019-12-22 17:54:31.023786330 +0000
+++ libcurvecpr-glib/include/curvecpr_glib/messager_glib.h
@@ -2,12 +2,11 @@
 #define __CURVECPR_GLIB_MESSAGER_GLIB_H
 
 #include <curvecpr/block.h>
+#include <curvecpr/bytes.h>
 #include <curvecpr/messager.h>
 
 #include <string.h>
 
-#include <sodium/crypto_uint64.h>
-
 #include <glib.h>
 
 struct curvecpr_messager_glib;

$NetBSD: patch-libcurvecpr_include_curvecpr_block.h,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr/include/curvecpr/block.h.orig	2019-12-22 17:54:24.664262284 +0000
+++ libcurvecpr/include/curvecpr/block.h
@@ -2,9 +2,7 @@
 #define __CURVECPR_BLOCK_H
 
 #include <string.h>
-
-#include <sodium/crypto_uint32.h>
-#include <sodium/crypto_uint64.h>
+#include <curvecpr/bytes.h>
 
 enum curvecpr_block_eofflag {
     CURVECPR_BLOCK_STREAM,

$NetBSD: patch-libcurvecpr_include_curvecpr_bytes.h,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr/include/curvecpr/bytes.h.orig	2019-12-22 17:51:15.224837301 +0000
+++ libcurvecpr/include/curvecpr/bytes.h
@@ -2,10 +2,11 @@
 #define __LIBCURVECPR_BYTES_H
 
 #include <string.h>
+#include <inttypes.h>
 
-#include <sodium/crypto_uint16.h>
-#include <sodium/crypto_uint32.h>
-#include <sodium/crypto_uint64.h>
+typedef uint16_t crypto_uint16;
+typedef uint32_t crypto_uint32;
+typedef uint64_t crypto_uint64;
 
 void curvecpr_bytes_copy (void *destination, const void *source, size_t num);
 void curvecpr_bytes_zero (void *destination, size_t num);

$NetBSD: patch-libcurvecpr_include_curvecpr_messager.h,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr/include/curvecpr/messager.h.orig	2019-12-22 17:55:13.590078135 +0000
+++ libcurvecpr/include/curvecpr/messager.h
@@ -1,13 +1,12 @@
 #ifndef __CURVECPR_MESSAGER_H
 #define __CURVECPR_MESSAGER_H
 
+#include "bytes.h"
 #include "block.h"
 #include "chicago.h"
 
 #include <string.h>
 
-#include <sodium/crypto_uint32.h>
-
 struct curvecpr_messager;
 
 struct curvecpr_messager_ops {

$NetBSD: patch-libcurvecpr_include_curvecpr_session.h,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr/include/curvecpr/session.h.orig	2019-12-22 17:53:48.570243631 +0000
+++ libcurvecpr/include/curvecpr/session.h
@@ -1,7 +1,7 @@
 #ifndef __CURVECPR_SESSION_H
 #define __CURVECPR_SESSION_H
 
-#include <sodium/crypto_uint64.h>
+#include <curvecpr/bytes.h>
 
 struct curvecpr_session {
     /* Any extensions. */

$NetBSD: patch-libcurvecpr_lib_bytes.c,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr/lib/bytes.c.orig	2019-12-22 17:53:50.601852676 +0000
+++ libcurvecpr/lib/bytes.c
@@ -4,10 +4,6 @@
 
 #include <string.h>
 
-#include <sodium/crypto_uint16.h>
-#include <sodium/crypto_uint32.h>
-#include <sodium/crypto_uint64.h>
-
 void curvecpr_bytes_copy (void *destination, const void *source, size_t num)
 {
     char *destination_copier = destination;

$NetBSD: patch-libcurvecpr_lib_messager.c,v 1.1 2019/12/22 22:28:54 joerg Exp $

--- libcurvecpr/lib/messager.c.orig	2019-12-22 17:53:53.626250749 +0000
+++ libcurvecpr/lib/messager.c
@@ -10,10 +10,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sodium/crypto_uint16.h>
-#include <sodium/crypto_uint32.h>
-#include <sodium/crypto_uint64.h>
-
 #define _STOP_SUCCESS 2048
 #define _STOP_FAILURE 4096