The branch master has been updated via 9e20068958b8c1772067299dda7df0b8a82283b4 (commit) from 569d0646096e6c7e07b9b89b04204eef934c3b69 (commit)
- Log ----------------------------------------------------------------- commit 9e20068958b8c1772067299dda7df0b8a82283b4 Author: Rich Salz <rs...@openssl.org> Date: Wed May 18 09:16:36 2016 -0400 Consolidate copyright for demos Reviewed-by: Richard Levitte <levi...@openssl.org> ----------------------------------------------------------------------- Summary of changes: demos/bio/client-arg.c | 9 +++++++++ demos/bio/client-conf.c | 9 +++++++++ demos/bio/saccept.c | 9 +++++++++ demos/bio/sconnect.c | 9 +++++++++ demos/bio/server-arg.c | 9 +++++++++ demos/bio/server-cmod.c | 9 +++++++++ demos/bio/server-conf.c | 9 +++++++++ demos/cms/cms_comp.c | 9 +++++++++ demos/cms/cms_ddec.c | 9 +++++++++ demos/cms/cms_dec.c | 9 +++++++++ demos/cms/cms_denc.c | 9 +++++++++ demos/cms/cms_enc.c | 9 +++++++++ demos/cms/cms_sign.c | 9 +++++++++ demos/cms/cms_sign2.c | 9 +++++++++ demos/cms/cms_uncomp.c | 9 +++++++++ demos/cms/cms_ver.c | 9 +++++++++ demos/evp/aesccm.c | 9 +++++++++ demos/evp/aesgcm.c | 9 +++++++++ demos/pkcs12/pkread.c | 8 ++++++++ demos/pkcs12/pkwrite.c | 8 ++++++++ demos/smime/smdec.c | 9 +++++++++ demos/smime/smenc.c | 9 +++++++++ demos/smime/smsign.c | 9 +++++++++ demos/smime/smsign2.c | 9 +++++++++ demos/smime/smver.c | 9 +++++++++ 25 files changed, 223 insertions(+) diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c index 630b166..9e136e5 100644 --- a/demos/bio/client-arg.c +++ b/demos/bio/client-arg.c @@ -1,3 +1,12 @@ +/* + * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #include <string.h> #include <openssl/err.h> #include <openssl/ssl.h> diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c index 4e4d4bc..66b5cac 100644 --- a/demos/bio/client-conf.c +++ b/demos/bio/client-conf.c @@ -1,3 +1,12 @@ +/* + * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #include <string.h> #include <openssl/err.h> #include <openssl/ssl.h> diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c index 240132c..106a089 100644 --- a/demos/bio/saccept.c +++ b/demos/bio/saccept.c @@ -1,3 +1,12 @@ +/* + * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /*- * A minimal program to serve an SSL connection. * It uses blocking. diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c index 16dba40..284bc30 100644 --- a/demos/bio/sconnect.c +++ b/demos/bio/sconnect.c @@ -1,3 +1,12 @@ +/* + * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /*- * A minimal program to do SSL to a passed host and port. * It is actually using non-blocking IO but in a very simple manner diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c index b2a43a9..4e9b7bd 100644 --- a/demos/bio/server-arg.c +++ b/demos/bio/server-arg.c @@ -1,4 +1,13 @@ /* + * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * A minimal program to serve an SSL connection. It uses blocking. It use the * SSL_CONF API with the command line. cc -I../../include server-arg.c * -L../.. -lssl -lcrypto -ldl diff --git a/demos/bio/server-cmod.c b/demos/bio/server-cmod.c index 51291da..77b456a 100644 --- a/demos/bio/server-cmod.c +++ b/demos/bio/server-cmod.c @@ -1,4 +1,13 @@ /* + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * A minimal TLS server it ses SSL_CTX_config and a configuration file to * set most server parameters. */ diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c index db624ba..32abefd 100644 --- a/demos/bio/server-conf.c +++ b/demos/bio/server-conf.c @@ -1,4 +1,13 @@ /* + * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * A minimal program to serve an SSL connection. It uses blocking. It uses * the SSL_CONF API with a configuration file. cc -I../../include saccept.c * -L../.. -lssl -lcrypto -ldl diff --git a/demos/cms/cms_comp.c b/demos/cms/cms_comp.c index f902d20..0d548f9 100644 --- a/demos/cms/cms_comp.c +++ b/demos/cms/cms_comp.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME compress example */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c index 3b23e8d..8f2e9ae 100644 --- a/demos/cms/cms_ddec.c +++ b/demos/cms/cms_ddec.c @@ -1,4 +1,13 @@ /* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * S/MIME detached data decrypt example: rarely done but should the need * arise this is an example.... */ diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c index 22181c2..4f9428b 100644 --- a/demos/cms/cms_dec.c +++ b/demos/cms/cms_dec.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME decryption example */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/cms/cms_denc.c b/demos/cms/cms_denc.c index 8aa82aa..adba69b 100644 --- a/demos/cms/cms_denc.c +++ b/demos/cms/cms_denc.c @@ -1,4 +1,13 @@ /* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * S/MIME detached data encrypt example: rarely done but should the need * arise this is an example.... */ diff --git a/demos/cms/cms_enc.c b/demos/cms/cms_enc.c index f4ba542..4d17d72 100644 --- a/demos/cms/cms_enc.c +++ b/demos/cms/cms_enc.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME encrypt example */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c index 8b5a64d..15bd5b8 100644 --- a/demos/cms/cms_sign.c +++ b/demos/cms/cms_sign.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME signing example */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c index 9fdd035..14ebf27 100644 --- a/demos/cms/cms_sign2.c +++ b/demos/cms/cms_sign2.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* S/MIME signing example: 2 signers */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/cms/cms_uncomp.c b/demos/cms/cms_uncomp.c index 2c10b81..3e3b4c4 100644 --- a/demos/cms/cms_uncomp.c +++ b/demos/cms/cms_uncomp.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME uncompression example */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/cms/cms_ver.c b/demos/cms/cms_ver.c index c6e83c0..43c10e2 100644 --- a/demos/cms/cms_ver.c +++ b/demos/cms/cms_ver.c @@ -1,3 +1,12 @@ +/* + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME verification example */ #include <openssl/pem.h> #include <openssl/cms.h> diff --git a/demos/evp/aesccm.c b/demos/evp/aesccm.c index e0240e5..cc4d0b5 100644 --- a/demos/evp/aesccm.c +++ b/demos/evp/aesccm.c @@ -1,4 +1,13 @@ /* + * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * Simple AES CCM test program, uses the same NIST data used for the FIPS * self test but uses the application level EVP APIs. */ diff --git a/demos/evp/aesgcm.c b/demos/evp/aesgcm.c index 72028a0..17b0ef4 100644 --- a/demos/evp/aesgcm.c +++ b/demos/evp/aesgcm.c @@ -1,4 +1,13 @@ /* + * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* * Simple AES GCM test program, uses the same NIST data used for the FIPS * self test but uses the application level EVP APIs. */ diff --git a/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c index 3739814..3b87d7a 100644 --- a/demos/pkcs12/pkread.c +++ b/demos/pkcs12/pkread.c @@ -1,3 +1,11 @@ +/* + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ #include <stdio.h> #include <stdlib.h> diff --git a/demos/pkcs12/pkwrite.c b/demos/pkcs12/pkwrite.c index d04a22b..e14cf83 100644 --- a/demos/pkcs12/pkwrite.c +++ b/demos/pkcs12/pkwrite.c @@ -1,3 +1,11 @@ +/* + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ #include <stdio.h> #include <stdlib.h> diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c index f1a987a..c4d1b09 100644 --- a/demos/smime/smdec.c +++ b/demos/smime/smdec.c @@ -1,3 +1,12 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME signing example */ #include <openssl/pem.h> #include <openssl/pkcs7.h> diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c index 79fe2d0..5d36e9a 100644 --- a/demos/smime/smenc.c +++ b/demos/smime/smenc.c @@ -1,3 +1,12 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME encrypt example */ #include <openssl/pem.h> #include <openssl/pkcs7.h> diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c index 8505e71..ba0adb3 100644 --- a/demos/smime/smsign.c +++ b/demos/smime/smsign.c @@ -1,3 +1,12 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME signing example */ #include <openssl/pem.h> #include <openssl/pkcs7.h> diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c index 415ecf3..2b7f45b 100644 --- a/demos/smime/smsign2.c +++ b/demos/smime/smsign2.c @@ -1,3 +1,12 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* S/MIME signing example: 2 signers. OpenSSL 0.9.9 only */ #include <openssl/pem.h> #include <openssl/pkcs7.h> diff --git a/demos/smime/smver.c b/demos/smime/smver.c index 13ba18b..75411c4 100644 --- a/demos/smime/smver.c +++ b/demos/smime/smver.c @@ -1,3 +1,12 @@ +/* + * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + /* Simple S/MIME verification example */ #include <openssl/pem.h> #include <openssl/pkcs7.h> _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits