diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-05 11:30:03 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:46:52 +0000 |
| commit | 3d7a9aca8c400683d2fb7eca799fa547f70e4832 (patch) | |
| tree | df80a7a4a55b2d094ddbf38f91b206960f28fbe1 /apps/s_cb.c | |
| parent | 4bc991384404d05e49e3aa622c142c7b7d05ef7b (diff) | |
Re-align some comments after running the reformat script.OpenSSL_1_0_0-post-reformat
This should be a one off operation (subsequent invokation of the
script should not move them)
This commit is for the 1.0.0 changes
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps/s_cb.c')
| -rw-r--r-- | apps/s_cb.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index 43d0f13b69..12c9b472cf 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -191,10 +191,10 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx) int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file) { if (cert_file != NULL) { - /*- - SSL *ssl; - X509 *x509; - */ + /*- + SSL *ssl; + X509 *x509; + */ if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) { @@ -212,20 +212,20 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file) return (0); } - /*- - In theory this is no longer needed - ssl=SSL_new(ctx); - x509=SSL_get_certificate(ssl); - - if (x509 != NULL) { - EVP_PKEY *pktmp; - pktmp = X509_get_pubkey(x509); - EVP_PKEY_copy_parameters(pktmp, - SSL_get_privatekey(ssl)); - EVP_PKEY_free(pktmp); - } - SSL_free(ssl); - */ + /*- + In theory this is no longer needed + ssl=SSL_new(ctx); + x509=SSL_get_certificate(ssl); + + if (x509 != NULL) { + EVP_PKEY *pktmp; + pktmp = X509_get_pubkey(x509); + EVP_PKEY_copy_parameters(pktmp, + SSL_get_privatekey(ssl)); + EVP_PKEY_free(pktmp); + } + SSL_free(ssl); + */ /* * If we are using DSA, we can copy the parameters from the private |