From 72e67ab0520988f62d88e38291c59f5cc93066e9 Mon Sep 17 00:00:00 2001 From: bg Date: Thu, 11 Jun 2015 13:39:49 +0200 Subject: [PATCH] reverting some less wise changes and adding license text to main. --- src/main.adb | 15 +++++++++++++++ src/sponge/spritz/spritz.adb | 4 ++-- src/sponge/spritz/spritz.ads | 4 ++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main.adb b/src/main.adb index 6d2b57d..7aa8012 100644 --- a/src/main.adb +++ b/src/main.adb @@ -1,3 +1,18 @@ +-- Copyright (C) 2015 Daniel Otte +-- +-- 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 . + with Ada.Text_IO; use Ada.Text_IO; with Crypto_Core_Types; use Crypto_Core_Types; with Crypto_Types; use Crypto_Types; diff --git a/src/sponge/spritz/spritz.adb b/src/sponge/spritz/spritz.adb index 6efb168..bf4f81e 100644 --- a/src/sponge/spritz/spritz.adb +++ b/src/sponge/spritz/spritz.adb @@ -110,14 +110,14 @@ package body Spritz is AbsorbNibble(ctx, Shift_Right(x, 4)); end Absorb; - procedure Absorb (ctx : in out Context; x : access constant u8_Array) is + procedure Absorb (ctx : in out Context; x : in u8_Array) is begin for i in x'Range loop Absorb(ctx, x(i)); end loop; end Absorb; - procedure Absorb (ctx : in out Context; x : access constant String) is + procedure Absorb (ctx : in out Context; x : in String) is begin for i in x'Range loop Absorb(ctx, u8(Character'Pos(x(i)))); diff --git a/src/sponge/spritz/spritz.ads b/src/sponge/spritz/spritz.ads index d58a88b..ebc2338 100644 --- a/src/sponge/spritz/spritz.ads +++ b/src/sponge/spritz/spritz.ads @@ -25,8 +25,8 @@ package Spritz is procedure InitializeContext (ctx : out Context); procedure AbsorbStop (ctx : in out Context); procedure Absorb (ctx : in out Context; x : in u8); - procedure Absorb (ctx : in out Context; x : access constant u8_Array); - procedure Absorb (ctx : in out Context; x : access constant String); + procedure Absorb (ctx : in out Context; x : in u8_Array); + procedure Absorb (ctx : in out Context; x : in String); procedure Drip (ctx : in out Context; z : out u8); procedure Squeeze (ctx : in out Context; P : out u8_Array);