Merge Nokia copyright notice into standard
authorRich Salz <rsalz@openssl.org>
Tue, 20 Jun 2017 14:14:36 +0000 (10:14 -0400)
committerRich Salz <rsalz@openssl.org>
Wed, 21 Jun 2017 12:59:18 +0000 (08:59 -0400)
commitc80149d9f09b3a5a5b1621fa705e900d455334d4
treec936bc25ea255c17eaa7c1cfbf1baaf207756e70
parentaa74c2ec016e1056f3df22507832644e6e6ac43c
Merge Nokia copyright notice into standard

This is done with the kind permission of Nokia.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3722)
20 files changed:
apps/s_client.c
apps/s_server.c
doc/man3/SSL_CTX_set_psk_client_callback.pod
doc/man3/SSL_CTX_use_psk_identity_hint.pod
doc/man3/SSL_get_psk_identity.pod
include/openssl/ssl.h
include/openssl/tls1.h
ssl/s3_enc.c
ssl/s3_lib.c
ssl/ssl_asn1.c
ssl/ssl_ciph.c
ssl/ssl_lib.c
ssl/ssl_locl.h
ssl/ssl_sess.c
ssl/ssl_stat.c
ssl/ssl_txt.c
ssl/statem/statem_clnt.c
ssl/statem/statem_srvr.c
ssl/t1_enc.c
test/ssltest_old.c