Index: head/security/libsodium/Makefile
===================================================================
--- head/security/libsodium/Makefile	(revision 508826)
+++ head/security/libsodium/Makefile	(revision 508827)
@@ -1,29 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	libsodium
-PORTVERSION=	1.0.16
+PORTVERSION=	1.0.18
 CATEGORIES=	security
 MASTER_SITES=	https://download.libsodium.org/libsodium/releases/
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Library to build higher-level cryptographic tools
 
 LICENSE=	ISCL
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS+=	--enable-blocking-random
 INSTALL_TARGET?=	install-strip
 TEST_TARGET=		check
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/THANKS ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/security/libsodium/distinfo
===================================================================
--- head/security/libsodium/distinfo	(revision 508826)
+++ head/security/libsodium/distinfo	(revision 508827)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513157053
-SHA256 (libsodium-1.0.16.tar.gz) = eeadc7e1e1bcef09680fb4837d448fbdf57224978f865ac1c16745868fbd0533
-SIZE (libsodium-1.0.16.tar.gz) = 1910835
+TIMESTAMP = 1565704155
+SHA256 (libsodium-1.0.18.tar.gz) = 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
+SIZE (libsodium-1.0.18.tar.gz) = 1919817
Index: head/security/libsodium/pkg-plist
===================================================================
--- head/security/libsodium/pkg-plist	(revision 508826)
+++ head/security/libsodium/pkg-plist	(revision 508827)
@@ -1,69 +1,71 @@
 include/sodium.h
 include/sodium/core.h
 include/sodium/crypto_aead_aes256gcm.h
 include/sodium/crypto_aead_chacha20poly1305.h
 include/sodium/crypto_aead_xchacha20poly1305.h
 include/sodium/crypto_auth.h
 include/sodium/crypto_auth_hmacsha256.h
 include/sodium/crypto_auth_hmacsha512.h
 include/sodium/crypto_auth_hmacsha512256.h
 include/sodium/crypto_box.h
 include/sodium/crypto_box_curve25519xchacha20poly1305.h
 include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 include/sodium/crypto_core_ed25519.h
 include/sodium/crypto_core_hchacha20.h
 include/sodium/crypto_core_hsalsa20.h
+include/sodium/crypto_core_ristretto255.h
 include/sodium/crypto_core_salsa20.h
 include/sodium/crypto_core_salsa2012.h
 include/sodium/crypto_core_salsa208.h
 include/sodium/crypto_generichash.h
 include/sodium/crypto_generichash_blake2b.h
 include/sodium/crypto_hash.h
 include/sodium/crypto_hash_sha256.h
 include/sodium/crypto_hash_sha512.h
 include/sodium/crypto_kdf.h
 include/sodium/crypto_kdf_blake2b.h
 include/sodium/crypto_kx.h
 include/sodium/crypto_onetimeauth.h
 include/sodium/crypto_onetimeauth_poly1305.h
 include/sodium/crypto_pwhash.h
 include/sodium/crypto_pwhash_argon2i.h
 include/sodium/crypto_pwhash_argon2id.h
 include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 include/sodium/crypto_scalarmult.h
 include/sodium/crypto_scalarmult_curve25519.h
 include/sodium/crypto_scalarmult_ed25519.h
+include/sodium/crypto_scalarmult_ristretto255.h
 include/sodium/crypto_secretbox.h
 include/sodium/crypto_secretbox_xchacha20poly1305.h
 include/sodium/crypto_secretbox_xsalsa20poly1305.h
 include/sodium/crypto_secretstream_xchacha20poly1305.h
 include/sodium/crypto_shorthash.h
 include/sodium/crypto_shorthash_siphash24.h
 include/sodium/crypto_sign.h
 include/sodium/crypto_sign_ed25519.h
 include/sodium/crypto_sign_edwards25519sha512batch.h
 include/sodium/crypto_stream.h
 include/sodium/crypto_stream_chacha20.h
 include/sodium/crypto_stream_salsa20.h
 include/sodium/crypto_stream_salsa2012.h
 include/sodium/crypto_stream_salsa208.h
 include/sodium/crypto_stream_xchacha20.h
 include/sodium/crypto_stream_xsalsa20.h
 include/sodium/crypto_verify_16.h
 include/sodium/crypto_verify_32.h
 include/sodium/crypto_verify_64.h
 include/sodium/export.h
 include/sodium/randombytes.h
-include/sodium/randombytes_salsa20_random.h
+include/sodium/randombytes_internal_random.h
 include/sodium/randombytes_sysrandom.h
 include/sodium/runtime.h
 include/sodium/utils.h
 include/sodium/version.h
 lib/libsodium.a
 lib/libsodium.so
 lib/libsodium.so.23
-lib/libsodium.so.23.1.0
+lib/libsodium.so.23.3.0
 libdata/pkgconfig/libsodium.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README.markdown
 %%PORTDOCS%%%%DOCSDIR%%/THANKS