Skip to content

Commit

Permalink
Fix minor issues in the demo/man pages for TLS client/blocking
Browse files Browse the repository at this point in the history
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #21133)
  • Loading branch information
mattcaswell authored and paulidale committed Jun 14, 2023
1 parent 2df71d6 commit edd5b9d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 1 addition & 3 deletions demos/guide/tls-client-block.c
Expand Up @@ -37,10 +37,8 @@ static BIO *create_socket_bio(const char *hostname, const char *port)
* Lookup IP address info for the server.
*/
if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, 0, SOCK_STREAM, 0,
&res)) {
BIO_closesocket(sock);
&res))
return NULL;
}

/*
* Loop through all the possible addresses for the server and find one
Expand Down
14 changes: 9 additions & 5 deletions doc/man7/ossl-guide-tls-client-block.pod
Expand Up @@ -166,16 +166,16 @@ provide the POSIX compatible I<connect> function. For example:
OpenSSL provides portable helper functions to do these tasks which also
integrate into the OpenSSL error system to log error data, e.g.

BIO_ADDRINFO *ai = NULL;
int sock = -1;
BIO_ADDRINFO *res;
const BIO_ADDRINFO *ai = NULL;

/*
* Lookup IP address info for the server.
*/
if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, 0, SOCK_STREAM, 0,
&res)) {
BIO_closesocket(sock);
&res))
return NULL;
}

/*
* Loop through all the possible addresses for the server and find one
Expand All @@ -199,6 +199,9 @@ integrate into the OpenSSL error system to log error data, e.g.
sock = -1;
continue;
}

/* We have a connected socket so break out of the loop */
break;
}

/* Free the address information resources we allocated earlier */
Expand Down Expand Up @@ -342,7 +345,8 @@ data from the server we use the L<SSL_read_ex(3)> function. In HTTP 1.0 the
client always writes data first.

size_t written;
const char *request = "GET / HTTP/1.0\r\nHost: "HOSTNAME"\r\n\r\n";
const char *request =
"GET / HTTP/1.0\r\nConnection: close\r\nHost: "HOSTNAME"\r\n\r\n";

/* Write an HTTP GET request to the peer */
if (!SSL_write_ex(ssl, request, strlen(request), &written)) {
Expand Down

0 comments on commit edd5b9d

Please sign in to comment.