Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import (29ebdae0) · Commits · Software / OSDI20 Artifacts / mariadb

extra/yassl/FLOSS-EXCEPTIONS

+2 −1

Original line number	Diff line number	Diff line
		yaSSL FLOSS License Exception
		****************************************

		Version 0.1, 26 June 2006
		Version 0.2, 31 August 2006

		The Sawtooth Consulting Ltd. Exception for Free/Libre and Open Source
		Software-only Applications Using yaSSL Libraries (the "FLOSS Exception").
		@@ -81,6 +81,7 @@ the GPL:
		Python license (CNRI Python License) -
		Python Software Foundation License 2.1.1
		Sleepycat License "1999"
		University of Illinois/NCSA Open Source License -
		W3C License "2001"
		X11 License "2001"
		Zlib/libpng License -

extra/yassl/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		SUBDIRS = taocrypt src testsuite
		EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \
		EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \
		CMakeLists.txt

extra/yassl/README

+12 −1

Original line number	Diff line number	Diff line
		yaSSL Release notes, version 1.3.7 (06/26/06)
		yaSSL Release notes, version 1.4.0 (08/13/06)


		This release of yaSSL contains bug fixes, portability enhancements,
		nonblocking connect and accept, better OpenSSL error mapping, and
		certificate caching for session resumption.

		See normal build instructions below under 1.0.6.
		See libcurl build instructions below under 1.3.0.


		********************yaSSL Release notes, version 1.3.7 (06/26/06)


		This release of yaSSL contains bug fixes, portability enhancements,

extra/yassl/examples/client/client.cpp

+28 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,13 @@ void client_test(void* args)

		SSL_set_fd(ssl, sockfd);

		if (SSL_connect(ssl) != SSL_SUCCESS) err_sys("SSL_connect failed");
		if (SSL_connect(ssl) != SSL_SUCCESS)
		{
		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);
		err_sys("SSL_connect failed");
		}
		showPeer(ssl);

		const char* cipher = 0;
		@@ -39,11 +45,16 @@ void client_test(void* args)
		strncat(list, cipher, strlen(cipher) + 1);
		}
		printf("%s\n", list);
		printf("Using Cipher Suite %s\n", SSL_get_cipher(ssl));
		printf("Using Cipher Suite: %s\n", SSL_get_cipher(ssl));

		char msg[] = "hello yassl!";
		if (SSL_write(ssl, msg, sizeof(msg)) != sizeof(msg))
		{
		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);
		err_sys("SSL_write failed");
		}

		char reply[1024];
		reply[SSL_read(ssl, reply, sizeof(reply))] = 0;
		@@ -56,22 +67,36 @@ void client_test(void* args)

		SSL_shutdown(ssl);
		SSL_free(ssl);
		tcp_close(sockfd);

		#ifdef TEST_RESUME
		tcp_connect(sockfd);
		SSL_set_fd(sslResume, sockfd);
		SSL_set_session(sslResume, session);

		if (SSL_connect(sslResume) != SSL_SUCCESS) err_sys("SSL resume failed");
		if (SSL_connect(sslResume) != SSL_SUCCESS)
		{
		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);
		err_sys("SSL resume failed");
		}
		showPeer(sslResume);

		if (SSL_write(sslResume, msg, sizeof(msg)) != sizeof(msg))
		{
		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);
		err_sys("SSL_write failed");
		}

		reply[SSL_read(sslResume, reply, sizeof(reply))] = 0;
		printf("Server response: %s\n", reply);

		SSL_shutdown(sslResume);
		SSL_free(sslResume);
		tcp_close(sockfd);
		#endif // TEST_RESUME

		SSL_CTX_free(ctx);

extra/yassl/examples/echoclient/echoclient.cpp

+14 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,14 @@ void echoclient_test(void* args)
		SSL* ssl = SSL_new(ctx);

		SSL_set_fd(ssl, sockfd);
		if (SSL_connect(ssl) != SSL_SUCCESS) err_sys("SSL_connect failed");

		if (SSL_connect(ssl) != SSL_SUCCESS)
		{
		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);
		err_sys("SSL_connect failed");
		}

		char send[1024];
		char reply[1024];
		@@ -50,7 +57,12 @@ void echoclient_test(void* args)

		int sendSz = strlen(send) + 1;
		if (SSL_write(ssl, send, sendSz) != sendSz)
		{
		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);
		err_sys("SSL_write failed");
		}

		if (strncmp(send, "quit", 4) == 0) {
		fputs("sending server shutdown command: quit!\n", fout);
		@@ -63,6 +75,7 @@ void echoclient_test(void* args)

		SSL_CTX_free(ctx);
		SSL_free(ssl);
		tcp_close(sockfd);

		fflush(fout);
		if (inCreated) fclose(fin);