From 669ed597d0b05f01144fc5563bfbe956ec1eeed4 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 26 Nov 2016 14:12:47 +0100 Subject: [PATCH] Rename box_x*poly1305.c -> secretbox_x*poly1305.c for consistency --- src/libsodium/Makefile.am | 4 ++-- ...{box_xchacha20poly1305.c => secretbox_xchacha20poly1305.c} | 0 .../{box_xsalsa20poly1305.c => secretbox_xsalsa20poly1305.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/libsodium/crypto_secretbox/xchacha20poly1305/sodium/{box_xchacha20poly1305.c => secretbox_xchacha20poly1305.c} (100%) rename src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/{box_xsalsa20poly1305.c => secretbox_xsalsa20poly1305.c} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 87e01b28..37caeb76 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -76,7 +76,7 @@ libsodium_la_SOURCES = \ crypto_secretbox/crypto_secretbox.c \ crypto_secretbox/crypto_secretbox_easy.c \ crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c \ - crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c \ + crypto_secretbox/xsalsa20poly1305/ref/secretbox_xsalsa20poly1305.c \ crypto_shorthash/crypto_shorthash.c \ crypto_shorthash/siphash24/shorthash_siphash24_api.c \ crypto_shorthash/siphash24/ref/shorthash_siphash24.c \ @@ -176,7 +176,7 @@ libsodium_la_SOURCES += \ crypto_core/salsa208/ref/core_salsa208.c \ crypto_core/salsa208/core_salsa208_api.c \ crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305_api.c \ - crypto_secretbox/xchacha20poly1305/sodium/box_xchacha20poly1305.c \ + crypto_secretbox/xchacha20poly1305/sodium/secretbox_xchacha20poly1305.c \ crypto_sign/ed25519/ref10/obsolete.c \ crypto_stream/aes128ctr/portable/afternm_aes128ctr.c \ crypto_stream/aes128ctr/stream_aes128ctr_api.c \ diff --git a/src/libsodium/crypto_secretbox/xchacha20poly1305/sodium/box_xchacha20poly1305.c b/src/libsodium/crypto_secretbox/xchacha20poly1305/sodium/secretbox_xchacha20poly1305.c similarity index 100% rename from src/libsodium/crypto_secretbox/xchacha20poly1305/sodium/box_xchacha20poly1305.c rename to src/libsodium/crypto_secretbox/xchacha20poly1305/sodium/secretbox_xchacha20poly1305.c diff --git a/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/secretbox_xsalsa20poly1305.c similarity index 100% rename from src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c rename to src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/secretbox_xsalsa20poly1305.c