crypto: migrate to SPDX identifier

Most tools used for compliance and SBOM generation use SPDX identifiers
This change brings us a step closer to an easy SBOM generation.

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

crypto/CMakeLists.txt

@@ -1,6 +1,8 @@
 # ##############################################################################
 # crypto/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

crypto/Makefile

@@ -1,6 +1,8 @@
 ############################################################################
 # crypto/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

crypto/aes.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/aes.c
- * $OpenBSD: aes.c,v 1.2 2020/07/22 13:54:30 tobhe Exp $
  *
- * Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 2016 Thomas Pornin <pornin@bolet.org>
  *
  * Modified for OpenBSD by Thomas Pornin and Mike Belopuhov.
  *
@@ -25,6 +25,7 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
  ****************************************************************************/
 
 /****************************************************************************

crypto/blake2s.c

@@ -1,6 +1,8 @@
 /****************************************************************************
  * crypto/blake2s.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

crypto/blf.c

@@ -1,12 +1,9 @@
 /****************************************************************************
  * crypto/blf.c
- * $OpenBSD: blf.c,v 1.8 2021/11/29 01:04:45 djm Exp $ *
  *
- * Blowfish block cipher for OpenBSD
+ * SPDX-License-Identifier: BSD-3-Clause
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * SPDX-FileCopyrightText: 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
+ * SPDX-FileContributor: advice by David Mazieres <dm@lcs.mit.edu>.
- *
- * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

crypto/bn.c

@@ -1,5 +1,8 @@
 /****************************************************************************
  * crypto/bn.c
+ *
+ * SPDX-License-Identifier: Unlicense
+ *
  * This is free and unencumbered software released into the public domain.
  * Anyone is free to copy, modify, publish, use, compile, sell, or
  * distribute this software, either in source code form or as a compiled

crypto/cast.c

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/cast.c
+ *
  * $OpenBSD: cast.c,v 1.4 2012/04/25 04:12:27 matthew Exp $
  *
  * CAST-128 in C

crypto/castsb.h

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/castsb.h
+ *
  * $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $
  *
  * CAST-128 in C

crypto/chacha_private.h

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/chacha_private.h
+ *
  * $OpenBSD: chacha_private.h,v 1.4 2020/07/22 13:54:30 tobhe Exp $
  *
  * chacha-merged.c version 20080118

crypto/chachapoly.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/chachapoly.c
- * $OpenBSD: chachapoly.c,v 1.6 2020/07/22 13:54:30 tobhe Exp $
  *
- * Copyright (c) 2015 Mike Belopuhov
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Mike Belopuhov
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

crypto/cmac.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/cmac.c
- * $OpenBSD: cmac.c,v 1.3 2017/05/02 17:07:06 mikeb Exp $
  *
- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: 2008 Damien Bergamini <damien.bergamini@free.fr>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

crypto/crypto.c

@@ -1,14 +1,9 @@
 /****************************************************************************
  * crypto/crypto.c
- * $OpenBSD: crypto.c,v 1.65 2014/07/13 23:24:47 deraadt Exp  $
  *
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
+ * SPDX-License-Identifier: OAR
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2000, 2001 Angelos D. Keromytis
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * SPDX-FileContributor: Angelos D. Keromytis (angelos@cis.upenn.edu)
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000, 2001 Angelos D. Keromytis
  *
  * Permission to use, copy, and modify this software with or without fee
  * is hereby granted, provided that this entire notice is included in
@@ -20,6 +15,11 @@
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
+ *
+ * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * supported the development of this code.
+ *
  ****************************************************************************/
 
 /****************************************************************************

crypto/cryptodev.c

@@ -1,7 +1,8 @@
 /****************************************************************************
  * crypto/cryptodev.c
- * $OpenBSD: cryptodev.c,v 1.82 2014/08/18 05:11:03 dlg Exp $
+ *
- * Copyright (c) 2001 Theo de Raadt
+ * SPDX-License-Identifier: BSD-2-Clause
+ * SPDX-FileCopyrightText: Copyright (c) 2001 Theo de Raadt
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,6 +28,7 @@
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  ****************************************************************************/
 
 /****************************************************************************

crypto/cryptosoft.c

@@ -1,13 +1,9 @@
 /****************************************************************************
  * crypto/cryptosoft.c
- * $OpenBSD: cryptosoft.c,v 1.71 2014/07/13 23:24:47 deraadt Exp $
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * SPDX-License-Identifier: OAR
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * SPDX-FileCopyrightText: Copyright (c) 2000, 2001 Angelos D. Keromytis
- * supported the development of this code.
+ * SPDX-FileContributor: Angelos D. Keromytis (angelos@cis.upenn.edu)
- *
- * Copyright (c) 2000, 2001 Angelos D. Keromytis
  *
  * Permission to use, copy, and modify this software with or without fee
  * is hereby granted, provided that this entire notice is included in
@@ -19,6 +15,11 @@
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
+ *
+ * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * supported the development of this code.
+ *
  ****************************************************************************/
 
 /****************************************************************************

crypto/curve25519.c

@@ -1,10 +1,9 @@
 /****************************************************************************
  * crypto/curve25519.c
- * $OpenBSD: curve25519.c,v 1.2 2020/07/22 13:54:30 tobhe Exp $
  *
- * Copyright (C) 2018-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights
+ * SPDX-License-Identifier: ISC
- * Reserved.
+ * SPDX-FileCopyrightText: 2018-2020 Jason A. Donenfeld <Jason@zx2c4.com>.
- * Copyright (C) 2015-2016 The fiat-crypto Authors.
+ * SPDX-FileCopyrightText: 2015-2016 The fiat-crypto Authors.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,6 +23,7 @@
  * generated, it has been tweaked to be suitable for use in the kernel.
  * It is optimized for 32-bit machines and machines that cannot work
  * efficiently with 128-bit integer types.
+ *
  ****************************************************************************/
 
 /****************************************************************************

crypto/des_locl.h

@@ -1,10 +1,9 @@
 /****************************************************************************
  * crypto/des_locl.h
- * $OpenBSD: des_locl.h,v 1.7 2015/12/10 21:00:51 naddy Exp $
  *
- * lib/des/des_locl.h
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young (eay@mincom.oz.au).
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/ecb3_enc.c

@@ -1,9 +1,9 @@
 /****************************************************************************
  * crypto/ecb3_enc.c
- * $OpenBSD: ecb3_enc.c,v 1.3 2013/11/18 18:49:53 brad Exp $
+ *
- * lib/des/ecb3_enc.c
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young (eay@mincom.oz.au).
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/ecb_enc.c

@@ -1,9 +1,9 @@
 /****************************************************************************
  * crypto/ecb_enc.c
- * $OpenBSD: ecb_enc.c,v 1.6 2015/12/10 21:00:51 naddy Exp $
+ *
- * lib/des/ecb_enc.c
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young (eay@mincom.oz.au).
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/gmac.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/gmac.c
- * $OpenBSD: gmac.c,v 1.10 2017/05/02 11:44:32 mikeb Exp $
  *
- * Copyright (c) 2010 Mike Belopuhov
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: Copyright (c) 2010 Mike Belopuhov
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- *
+ ****************************************************************************/
+
+/****************************************************************************
  *
  * This code implements the Message Authentication part of the
  * Galois/Counter Mode (as being described in the RFC 4543) using

crypto/hmac.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/hmac.c
- * $OpenBSD: hmac.c,v 1.4 2016/09/19 18:09:40 tedu Exp $
  *
- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: 2008 Damien Bergamini <damien.bergamini@free.fr>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

crypto/hmac_buff.c

@@ -1,6 +1,8 @@
 /****************************************************************************
  * crypto/hmac_buff.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

crypto/idgen.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/idgen.c
- * $OpenBSD: idgen.c,v 1.8 2020/07/22 13:54:30 tobhe Exp $
  *
- * Copyright (c) 2008 Damien Miller <djm@mindrot.org>
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: 2008 Damien Miller <djm@mindrot.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,6 +15,7 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  ****************************************************************************/
 
 /* IDGEN32: non-repeating ID generation covering an almost maximal 32-bit

crypto/key_wrap.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/key_wrap.c
- * $OpenBSD: key_wrap.c,v 1.5 2017/05/02 17:07:06 mikeb Exp $
  *
- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: 2008 Damien Bergamini <damien.bergamini@free.fr>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,6 +15,7 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  ****************************************************************************/
 
 /* This code implements the AES Key Wrap algorithm described in RFC 3394. */

crypto/md5.c

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/md5.c
+ *
  * $OpenBSD: md5.c,v 1.4 2014/12/28 10:04:35 tedu Exp $
  *
  * This code implements the MD5 message-digest algorithm.
@@ -16,6 +17,7 @@
  * MD5Context structure, pass it to MD5Init, call MD5Update as
  * needed on buffers full of bytes, and then call MD5Final, which
  * will fill a supplied 16-byte array with the digest.
+ *
  ****************************************************************************/
 
 /****************************************************************************

crypto/podd.h

@@ -1,9 +1,9 @@
 /****************************************************************************
  * crypto/podd.h
- * $OpenBSD: podd.h,v 1.1 2000/02/28 23:13:05 deraadt Exp $
+ *
- * lib/des/podd.h
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/poly1305.c

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/poly1305.c
+ *
  * $OpenBSD: poly1305.c,v 1.2 2020/07/22 13:54:30 tobhe Exp $
  *
  * Public Domain poly1305 from Andrew Moon

crypto/random_pool.c

@@ -1,6 +1,8 @@
 /****************************************************************************
  * crypto/random_pool.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

crypto/rijndael.c

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/rijndael.c
+ *
  * $OpenBSD: rijndael.c,v 1.20 2014/11/17 12:27:47 mikeb Exp $
  *
  * rijndael-alg-fst.c

crypto/rmd160.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * crypto/rmd160.c
- * $OpenBSD: rmd160.c,v 1.5 2011/01/11 15:42:05 deraadt Exp $
  *
- * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * SPDX-FileCopyrightText: 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,6 +24,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ ****************************************************************************/
+
+/****************************************************************************
  * Preneel, Bosselaers, Dobbertin,
  * "The Cryptographic Hash Function RIPEMD-160",
  * RSA Laboratories, CryptoBytes, Volume 3, Number 2, Autumn 1997,

crypto/set_key.c

@@ -1,9 +1,9 @@
 /****************************************************************************
  * crypto/set_key.c
- * $OpenBSD: set_key.c,v 1.5 2021/03/12 10:22:46 jsg Exp $
+ *
- * lib/des/set_key.c
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young (eay@mincom.oz.au).
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/sha1.c

@@ -1,5 +1,6 @@
 /****************************************************************************
  * crypto/sha1.c
+ *
  * $OpenBSD: sha1.c,v 1.11 2014/12/28 10:04:35 tedu Exp $
  *
  * SHA-1 in C

crypto/sha2.c

@@ -1,11 +1,9 @@
 /****************************************************************************
  * crypto/sha2.c
- * $OpenBSD: sha2.c,v 1.19 2021/03/12 10:22:46 jsg Exp $
- * FILE: sha2.c
- * AUTHOR: Aaron D. Gifford <me@aarongifford.com>
  *
- * Copyright (c) 2000-2001, Aaron D. Gifford
+ * SPDX-License-Identifier: BSD-3-Clause
- * All rights reserved.
+ * SPDX-FileCopyrightText: 2000-2001, Aaron D. Gifford
+ * SPDX-FileCopyrightText: Aaron D. Gifford <me@aarongifford.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +29,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
  ****************************************************************************/
 
 /****************************************************************************

crypto/siphash.c

@@ -1,9 +1,8 @@
 /****************************************************************************
  * crypto/siphash.c
- * $OpenBSD: siphash.c,v 1.5 2018/01/05 19:05:09 mikeb Exp $
  *
- * Copyright (c) 2013 Andre Oppermann <andre@FreeBSD.org>
+ * SPDX-License-Identifier: BSD-3-Clause
- * All rights reserved.
+ * SPDX-FileCopyrightText: 2013 Andre Oppermann <andre@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

crypto/sk.h

@@ -1,9 +1,9 @@
 /****************************************************************************
  * crypto/sk.h
- * $OpenBSD: sk.h,v 1.2 2002/10/27 13:24:26 miod Exp $
+ *
- * lib/des/sk.h
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young (eay@mincom.oz.au).
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/spr.h

@@ -1,9 +1,9 @@
 /****************************************************************************
  * crypto/spr.h
- * $OpenBSD: spr.h,v 1.2 2002/10/27 13:24:26 miod Exp $
+ *
- * lib/des/spr.h
+ * SPDX-License-Identifier: SSLeay-standalone
- * Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * SPDX-FileCopyrightText: Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
+ * SPDX-FileCopyrightText: Eric Young (eay@mincom.oz.au).
  *
  * This file is part of an SSL implementation written
  * by Eric Young (eay@mincom.oz.au).

crypto/testmngr.c

@@ -1,6 +1,8 @@
 /****************************************************************************
  * crypto/testmngr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

crypto/testmngr.h

@@ -1,6 +1,8 @@
 /****************************************************************************
  * crypto/testmngr.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The