1 files changed, 34 insertions, 30 deletions

diff --git a/src/lib/libcrypto/doc/EVP_EncryptInit.pod b/src/lib/libcrypto/doc/EVP_EncryptInit.pod
index a876ac789c..b2211ea6d3 100644
--- a/src/lib/libcrypto/doc/EVP_EncryptInit.pod
+++ b/src/lib/libcrypto/doc/EVP_EncryptInit.pod
@@ -427,46 +427,49 @@ Set the effective key length used in RC2:
 
 Encrypt a string using blowfish:
 
- int do_crypt(char *outfile)
-        {
+ int
+ do_crypt(char *outfile)
+ {
         unsigned char outbuf[1024];
         int outlen, tmplen;
-        /* Bogus key and IV: we'd normally set these from
+        /*
+         * Bogus key and IV: we'd normally set these from
          * another source.
          */
         unsigned char key[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
         unsigned char iv[] = {1,2,3,4,5,6,7,8};
-        char intext[] = "Some Crypto Text";
+        const char intext[] = "Some Crypto Text";
         EVP_CIPHER_CTX ctx;
         FILE *out;
         EVP_CIPHER_CTX_init(&ctx);
         EVP_EncryptInit_ex(&ctx, EVP_bf_cbc(), NULL, key, iv);
 
-        if(!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext, strlen(intext)))
-                {
+        if (!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext,
+            strlen(intext))) {
                 /* Error */
                 return 0;
-                }
-        /* Buffer passed to EVP_EncryptFinal() must be after data just
+        }
+        /*
+         * Buffer passed to EVP_EncryptFinal() must be after data just
          * encrypted to avoid overwriting it.
          */
-        if(!EVP_EncryptFinal_ex(&ctx, outbuf + outlen, &tmplen))
-                {
+        if (!EVP_EncryptFinal_ex(&ctx, outbuf + outlen, &tmplen)) {
                 /* Error */
                 return 0;
-                }
+        }
         outlen += tmplen;
         EVP_CIPHER_CTX_cleanup(&ctx);
-        /* Need binary mode for fopen because encrypted data is
+        /*
+         * Need binary mode for fopen because encrypted data is
          * binary data. Also cannot use strlen() on it because
-         * it wont be null terminated and may contain embedded
-         * nulls.
+         * it won't be NUL terminated and may contain embedded
+         * NULs.
          */
         out = fopen(outfile, "wb");
         fwrite(outbuf, 1, outlen, out);
         fclose(out);
         return 1;
-        }
+ }
 
 The ciphertext from the above example can be decrypted using the B<openssl>
 utility with the command line:
@@ -476,16 +479,19 @@ utility with the command line:
 General encryption, decryption function example using FILE I/O and RC2 with an
 80 bit key:
 
- int do_crypt(FILE *in, FILE *out, int do_encrypt)
-        {
+ int
+ do_crypt(FILE *in, FILE *out, int do_encrypt)
+ {
         /* Allow enough space in output buffer for additional block */
         inbuf[1024], outbuf[1024 + EVP_MAX_BLOCK_LENGTH];
         int inlen, outlen;
-        /* Bogus key and IV: we'd normally set these from
+        /*
+         * Bogus key and IV: we'd normally set these from
          * another source.
          */
         unsigned char key[] = "0123456789";
         unsigned char iv[] = "12345678";
+
         /* Don't set key or IV because we will modify the parameters */
         EVP_CIPHER_CTX_init(&ctx);
         EVP_CipherInit_ex(&ctx, EVP_rc2(), NULL, NULL, NULL, do_encrypt);
@@ -493,30 +499,28 @@ General encryption, decryption function example using FILE I/O and RC2 with an
         /* We finished modifying parameters so now we can set key and IV */
         EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt);
 
-        for(;;)
-                {
+        for(;;) {
                 inlen = fread(inbuf, 1, 1024, in);
-                if(inlen <= 0) break;
-                if(!EVP_CipherUpdate(&ctx, outbuf, &outlen, inbuf, inlen))
-                        {
+                if (inlen <= 0)
+                        break;
+                if (!EVP_CipherUpdate(&ctx, outbuf, &outlen, inbuf,
+                    inlen)) {
                         /* Error */
                         EVP_CIPHER_CTX_cleanup(&ctx);
                         return 0;
-                        }
-                fwrite(outbuf, 1, outlen, out);
                 }
-        if(!EVP_CipherFinal_ex(&ctx, outbuf, &outlen))
-                {
+                fwrite(outbuf, 1, outlen, out);
+        }
+        if (!EVP_CipherFinal_ex(&ctx, outbuf, &outlen)) {
                 /* Error */
                 EVP_CIPHER_CTX_cleanup(&ctx);
                 return 0;
-                }
+        }
         fwrite(outbuf, 1, outlen, out);
 
         EVP_CIPHER_CTX_cleanup(&ctx);
         return 1;
-        }
-
+ }
 
 =head1 SEE ALSO