moving things around, cleanup

DSlogic.sh

-#!/bin/sh
-##
-## This file is part of the sigrok-util project.
-##
-## Copyright (C) 2016 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, see <http://www.gnu.org/licenses/>.
-##
-
-umask 022
-
-WGET="wget -c -q"
-if [ -z $PREFIX ]; then
-        PREFIX="/usr/local"
-fi
-FWDIR="$PREFIX/share/sigrok-firmware"
-
-# Use the upstream 0.97 firmware/bitstream set. This is the only supported
-# set of files in libsigrok >= 20170621.
-FWURL="https://github.com/DreamSourceLab/DSView/raw/886b847c21c606df3138ce7ad8f8e8c363ee758b/DSView/res"
-
-echo "Installing into: $FWDIR"
-
-mkdir -p $FWDIR
-
-$WGET $FWURL/DSLogic50.bin -O $FWDIR/dreamsourcelab-dslogic-fpga-5v.fw
-$WGET $FWURL/DSLogic33.bin -O $FWDIR/dreamsourcelab-dslogic-fpga-3v3.fw
-$WGET $FWURL/DSLogic.fw -O $FWDIR/dreamsourcelab-dslogic-fx2.fw
-
-$WGET $FWURL/DSCope.bin -O $FWDIR/dreamsourcelab-dscope-fpga.fw
-$WGET $FWURL/DSCope.fw -O $FWDIR/dreamsourcelab-dscope-fx2.fw
-
-$WGET $FWURL/DSLogicPro.bin -O $FWDIR/dreamsourcelab-dslogic-pro-fpga.fw
-$WGET $FWURL/DSLogicPro.fw -O $FWDIR/dreamsourcelab-dslogic-pro-fx2.fw
-
-$WGET $FWURL/DSLogicPlus.bin -O $FWDIR/dreamsourcelab-dslogic-plus-fpga.fw
-$WGET $FWURL/DSLogicPlus.fw -O $FWDIR/dreamsourcelab-dslogic-plus-fx2.fw
-
-$WGET $FWURL/DSLogicBasic.bin -O $FWDIR/dreamsourcelab-dslogic-basic-fpga.fw
-$WGET $FWURL/DSLogicBasic.fw -O $FWDIR/dreamsourcelab-dslogic-basic-fx2.fw

all-lwc-submission-files/mbed_aes_gcm

-../mbed_aes_gcm/
\ No newline at end of file

example-submissions/nocrypt/Implementations/crypto_aead/nocrypt/ref/Makefile

+CC=gcc
+#NISTGCCFLAGS=-std=c99 -Wall -Wextra -Wshadow -fsanitize=address,undefined -O2
+NISTGCCFLAGS=-std=c99 -Wall -Wextra -Wshadow -Os
+
+LFLAGS=-lm
+
+all: nocrypt
+
+nocrypt: nocrypt.c genkat_aead.c
+	$(CC) $(NISTGCCFLAGS) -o $@ $^ $(LFLAGS)
+
+.PHONY: clean
+
+clean:
+	rm -f *.o
+	rm -f nocrypt
+

example-submissions/nocrypt/Implementations/crypto_aead/nocrypt/ref/api.h

+#define CRYPTO_KEYBYTES 0
+#define CRYPTO_NSECBYTES 0 
+#define CRYPTO_NPUBBYTES 0
+#define CRYPTO_ABYTES 0
+#define CRYPTO_NOOVERLAP 1 

example-submissions/nocrypt/Implementations/crypto_aead/nocrypt/ref/crypto_aead.h

+typedef unsigned long long u64;
+
+int crypto_encrypt(
+		   unsigned char *c,unsigned long long *clen,
+		   const unsigned char *m,unsigned long long mlen,
+		   const unsigned char *nsec,
+		   const unsigned char *npub,
+		   const unsigned char *k
+		   );
+
+int crypto_decrypt(
+			unsigned char *m,unsigned long long *mlen,
+			unsigned char *nsec,
+			const unsigned char *c,unsigned long long clen,
+			const unsigned char *npub,
+			const unsigned char *k
+			);
+
+int crypto_aead_encrypt(
+	unsigned char *c, unsigned long long *clen,
+	const unsigned char *m, unsigned long long mlen,
+	const unsigned char *ad, unsigned long long adlen,
+	const unsigned char *nsec,
+	const unsigned char *npub,
+	const unsigned char *k
+);
+
+int crypto_aead_decrypt(
+	unsigned char *m, unsigned long long *mlen,
+	unsigned char *nsec,
+	const unsigned char *c, unsigned long long clen,
+	const unsigned char *ad, unsigned long long adlen,
+	const unsigned char *npub,
+	const unsigned char *k
+);
+

example-submissions/nocrypt/Implementations/crypto_aead/nocrypt/ref/genkat_aead.c

+//
+// NIST-developed software is provided by NIST as a public service.
+// You may use, copy and distribute copies of the software in any medium,
+// provided that you keep intact this entire notice. You may improve, 
+// modify and create derivative works of the software or any portion of
+// the software, and you may copy and distribute such modifications or
+// works. Modified works should carry a notice stating that you changed
+// the software and should note the date and nature of any such change.
+// Please explicitly acknowledge the National Institute of Standards and 
+// Technology as the source of the software.
+//
+// NIST-developed software is expressly provided "AS IS." NIST MAKES NO 
+// WARRANTY OF ANY KIND, EXPRESS, IMPLIED, IN FACT OR ARISING BY OPERATION
+// OF LAW, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT AND DATA ACCURACY. NIST
+// NEITHER REPRESENTS NOR WARRANTS THAT THE OPERATION OF THE SOFTWARE WILL BE 
+// UNINTERRUPTED OR ERROR-FREE, OR THAT ANY DEFECTS WILL BE CORRECTED. NIST 
+// DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF THE SOFTWARE
+// OR THE RESULTS THEREOF, INCLUDING BUT NOT LIMITED TO THE CORRECTNESS, ACCURACY,
+// RELIABILITY, OR USEFULNESS OF THE SOFTWARE.
+//
+// You are solely responsible for determining the appropriateness of using and 
+// distributing the software and you assume all risks associated with its use, 
+// including but not limited to the risks and costs of program errors, compliance 
+// with applicable laws, damage to or loss of data, programs or equipment, and 
+// the unavailability or interruption of operation. This software is not intended
+// to be used in any situation where a failure could cause risk of injury or 
+// damage to property. The software developed by NIST employees is not subject to
+// copyright protection within the United States.
+//
+
+// disable deprecation for sprintf and fopen
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "crypto_aead.h"
+#include "api.h"
+
+#define KAT_SUCCESS          0
+#define KAT_FILE_OPEN_ERROR -1
+#define KAT_DATA_ERROR      -3
+#define KAT_CRYPTO_FAILURE  -4
+
+#define MAX_FILE_NAME				256
+#define MAX_MESSAGE_LENGTH			32
+#define MAX_ASSOCIATED_DATA_LENGTH	32
+
+void init_buffer(unsigned char *buffer, unsigned long long numbytes);
+
+void fprint_bstr(FILE *fp, const char *label, const unsigned char *data, unsigned long long length);
+
+int generate_test_vectors();
+
+int main()
+{
+	int ret = generate_test_vectors();
+
+	if (ret != KAT_SUCCESS) {
+		fprintf(stderr, "test vector generation failed with code %d\n", ret);
+	}
+
+	return ret;
+}
+
+int generate_test_vectors()
+{
+	FILE                *fp;
+	char                fileName[MAX_FILE_NAME];
+	unsigned char       key[CRYPTO_KEYBYTES];
+	unsigned char		nonce[CRYPTO_NPUBBYTES];
+	unsigned char       msg[MAX_MESSAGE_LENGTH];
+	unsigned char       msg2[MAX_MESSAGE_LENGTH];
+	unsigned char		ad[MAX_ASSOCIATED_DATA_LENGTH];
+	unsigned char		ct[MAX_MESSAGE_LENGTH + CRYPTO_ABYTES];
+	unsigned long long  clen, mlen2;
+	int                 count = 1;
+	int                 func_ret, ret_val = KAT_SUCCESS;
+
+	init_buffer(key, sizeof(key));
+	init_buffer(nonce, sizeof(nonce));
+	init_buffer(msg, sizeof(msg));
+	init_buffer(ad, sizeof(ad));
+
+	sprintf(fileName, "LWC_AEAD_KAT_%d_%d.txt", (CRYPTO_KEYBYTES * 8), (CRYPTO_NPUBBYTES * 8));
+
+	if ((fp = fopen(fileName, "w")) == NULL) {
+		fprintf(stderr, "Couldn't open <%s> for write\n", fileName);
+		return KAT_FILE_OPEN_ERROR;
+	}
+
+	for (unsigned long long mlen = 0; (mlen <= MAX_MESSAGE_LENGTH) && (ret_val == KAT_SUCCESS); mlen++) {
+	  //for (unsigned long long mlen = 0; (mlen <= 32) && (ret_val == KAT_SUCCESS); mlen++) {
+	  for (unsigned long long adlen = 0; adlen <= MAX_ASSOCIATED_DATA_LENGTH; adlen++) {
+	    //for (unsigned long long adlen = 0; adlen <= 32; adlen++) {
+
+	    printf("%0d\n", (int)clen);
+
+			fprintf(fp, "Count = %d\n", count++);
+			printf("Count = %d\n", count - 1);
+
+			fprint_bstr(fp, "Key = ", key, CRYPTO_KEYBYTES);
+
+			fprint_bstr(fp, "Nonce = ", nonce, CRYPTO_NPUBBYTES);
+
+			fprint_bstr(fp, "PT = ", msg, mlen);
+
+			fprint_bstr(fp, "AD = ", ad, adlen);
+
+			if ((func_ret = crypto_aead_encrypt(ct, &clen, msg, mlen, ad, adlen, NULL, nonce, key)) != 0) {
+				fprintf(fp, "crypto_aead_encrypt returned <%d>\n", func_ret);
+				ret_val = KAT_CRYPTO_FAILURE;
+				break;
+			}
+			
+			fprint_bstr(fp, "CT = ", ct, clen);
+
+			fprintf(fp, "\n");
+
+			 if ((func_ret = crypto_aead_decrypt(msg2, &mlen2, NULL, ct, clen, ad, adlen, nonce, key)) != 0) { 
+			 	fprintf(fp, "crypto_aead_decrypt returned <%d>\n", func_ret); 
+			 	ret_val = KAT_CRYPTO_FAILURE; 
+			 	break; 
+			 } 
+
+			 if (mlen != mlen2) { 
+			 	fprintf(fp, "crypto_aead_decrypt returned bad 'mlen': Got <%llu>, expected <%llu>\n", mlen2, mlen); 
+			 	ret_val = KAT_CRYPTO_FAILURE; 
+			 	break; 
+			 } 
+
+			 if (memcmp(msg, msg2, mlen)) { 
+			 	fprintf(fp, "crypto_aead_decrypt did not recover the plaintext\n"); 
+			 	ret_val = KAT_CRYPTO_FAILURE; 
+			 	break; 
+			 } 
+		}
+	}
+
+	fclose(fp);
+
+	return ret_val;
+}
+
+
+void fprint_bstr(FILE *fp, const char *label, const unsigned char *data, unsigned long long length)
+{    
+    fprintf(fp, "%s", label);
+        
+	for (unsigned long long i = 0; i < length; i++)
+		fprintf(fp, "%02X", data[i]);
+	    
+    fprintf(fp, "\n");
+}
+
+void init_buffer(unsigned char *buffer, unsigned long long numbytes)
+{
+	for (unsigned long long i = 0; i < numbytes; i++)
+		buffer[i] = (unsigned char)i;
+}

example-submissions/nocrypt/Implementations/crypto_aead/nocrypt/ref/nocrypt.c

+#include "api.h"
+#include "crypto_aead.h"
+
+#include <string.h>
+
+int crypto_aead_encrypt(
+      unsigned char *c,unsigned long long *clen,
+      const unsigned char *m,unsigned long long mlen,
+      const unsigned char *ad,unsigned long long adlen,
+      const unsigned char *nsec,
+      const unsigned char *npub,
+      const unsigned char *k
+      )
+{
+  *clen = mlen + CRYPTO_ABYTES;
+  memcpy(c, m, mlen);
+  memset(c + mlen, 0, CRYPTO_ABYTES);
+
+  return 0;
+}
+
+int crypto_aead_decrypt(
+  unsigned char *m, unsigned long long *mlen,
+  unsigned char *nsec,
+  const unsigned char *c, unsigned long long clen,
+  const unsigned char *ad, unsigned long long adlen,
+  const unsigned char *npub,
+  const unsigned char *k
+)
+{
+  unsigned long long len = *mlen = clen - CRYPTO_ABYTES;
+  memcpy(m, c, len);
+
+  return 0;
+}
+

pack_results.sh

-#!/bin/bash
-zip results.zip build/*/*.log measurements/* compile_all.log compile_all.err.log build/test_all.sh