Merge branch 'master' into dev/next-release

- Keep next-release branch up to date with master.

doc/Makefile

@@ -34,4 +34,5 @@ $(SPEC_OUT) : $(SPEC_TEX) $(SPEC_EXTRA) $(SPEC_COMMIT)
 spec: $(SPEC_OUT)
 
 clean:
-	rm -r $(BUILD_DIR)/*
+	rm -rf $(BUILD_DIR)/* $(OPCODES) \
+		*.aux *.bbl *.blg *.log *.out *.pdf *.run.xml *-blx.bib *.toc

doc/riscv-crypto-spec.bib

@@ -79,6 +79,9 @@ @misc{cryptoeprint:2020:930
     note = {\url{https://eprint.iacr.org/2020/930}},
 }
 
+
+%	Note: The ASHES'20 published version is SaNeMa20
+
 @misc{cryptoeprint:2020:866,
     author = {Markku-Juhani O. Saarinen and G. Richard Newell and Ben Marshall},
     title = {Building a Modern TRNG: An Entropy Source Interface for RISC-V},
@@ -803,14 +806,14 @@ @Misc{		  NI19
   year		= {2019}
 }
 
-@Misc{		  NICC19,
+@Misc{		  NICC20,
   author	= {{NIST} and {CCCS}},
   title		= {Implementation Guidance for {FIPS} 140-2 and the
 		  Cryptographic Module Validation Program},
   howpublished	= {CMVP Update},
-  month		= {December},
-  url		= {https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Module-Validation-Program/documents/fips140-2/FIPS1402IG.pdf},
-  year		= {2019}
+  month		= {August},
+  url		= {https://csrc.nist.gov/CSRC/media/Projects/cryptographic-module-validation-program/documents/fips140-2/FIPS1402IG.pdf},
+  year		= {2020}
 }
 
 @Misc{		  NS15,
@@ -905,15 +908,33 @@ @Misc{		  Sa19
   year		= {2019}
 }
 
-@Misc{		  Sa20,
+@InProceedings{	  Sa20,
   author	= {Markku-Juhani O. Saarinen},
-  title		= {A Lightweight ISA Extension for AES and SM4},
-  howpublished	= {To appear in SECRISC-V 2020. arXiv:2002.07041},
+  title		= {A Lightweight ISA Extension for {AES} and {SM4}},
+  booktitle	= {First International Workshop on Secure RISC-V Architecture
+		  Design Exploration (SECRISC-V'20)},
   url		= {https://arxiv.org/abs/2002.07041},
-  month		= {March},
+  publisher	= {IEEE},
+  month		= {August},
+  pages		= {To appear},
   year		= {2020}
 }
 
+
+@InProceedings{	  SaNeMa20,
+  author	= {Markku-Juhani O. Saarinen and G. Richard Newell and Ben
+		  Marshall},
+  title		= {Building a Modern {TRNG}: An Entropy Source Interface for
+		  {RISC}-{V}},
+  booktitle	= {4th Workshop on Attacks and Solutions in Hardware Security
+		  (ASHES’20), November 13, 2020, Virtual Event, USA.},
+  doi		= {10.1145/3411504.3421212},
+  publisher	= {ACM},
+  url		= {https://eprint.iacr.org/2020/866},
+  month		= {November},
+  year		= 2020
+}
+
 @Misc{		  Sc99,
   author	= {Werner Schindler},
   title		= {Functionality classes and evaluation methodology for