ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/vendor-crypto/openssl/dist/apps/version.c
(Generate patch)

Comparing vendor-crypto/openssl/dist/apps/version.c (file contents):
Revision 6975 by laffer1, Sun Oct 12 20:29:54 2014 UTC vs.
Revision 6976 by laffer1, Fri Mar 20 00:01:13 2015 UTC

# Line 5 | Line 5
5   * This package is an SSL implementation written
6   * by Eric Young (eay@cryptsoft.com).
7   * The implementation was written so as to conform with Netscapes SSL.
8 < *
8 > *
9   * This library is free for commercial and non-commercial use as long as
10   * the following conditions are aheared to.  The following conditions
11   * apply to all code found in this distribution, be it the RC4, RSA,
12   * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
13   * included with this distribution is covered by the same copyright terms
14   * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 < *
15 > *
16   * Copyright remains Eric Young's, and as such any Copyright notices in
17   * the code are not to be removed.
18   * If this package is used in a product, Eric Young should be given attribution
19   * as the author of the parts of the library used.
20   * This can be in the form of a textual message at program startup or
21   * in documentation (online or textual) provided with the package.
22 < *
22 > *
23   * Redistribution and use in source and binary forms, with or without
24   * modification, are permitted provided that the following conditions
25   * are met:
# Line 34 | Line 34
34   *     Eric Young (eay@cryptsoft.com)"
35   *    The word 'cryptographic' can be left out if the rouines from the library
36   *    being used are not cryptographic related :-).
37 < * 4. If you include any Windows specific code (or a derivative thereof) from
37 > * 4. If you include any Windows specific code (or a derivative thereof) from
38   *    the apps directory (application code) you must include an acknowledgement:
39   *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 < *
40 > *
41   * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# Line 49 | Line 49
49   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51   * SUCH DAMAGE.
52 < *
52 > *
53   * The licence and distribution terms for any publically available version or
54   * derivative of this code cannot be changed.  i.e. this code cannot simply be
55   * copied and put under another distribution licence
# Line 63 | Line 63
63   * are met:
64   *
65   * 1. Redistributions of source code must retain the above copyright
66 < *    notice, this list of conditions and the following disclaimer.
66 > *    notice, this list of conditions and the following disclaimer.
67   *
68   * 2. Redistributions in binary form must reproduce the above copyright
69   *    notice, this list of conditions and the following disclaimer in
# Line 133 | Line 133
133   #endif
134  
135   #undef PROG
136 < #define PROG    version_main
136 > #define PROG    version_main
137  
138   int MAIN(int, char **);
139  
140   int MAIN(int argc, char **argv)
141 <        {
142 <        int i,ret=0;
143 <        int cflags=0,version=0,date=0,options=0,platform=0,dir=0;
141 > {
142 >    int i, ret = 0;
143 >    int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
144  
145 <        apps_startup();
145 >    apps_startup();
146  
147 <        if (bio_err == NULL)
148 <                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
149 <                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
147 >    if (bio_err == NULL)
148 >        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
149 >            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
150  
151 <        if (argc == 1) version=1;
152 <        for (i=1; i<argc; i++)
153 <                {
154 <                if (strcmp(argv[i],"-v") == 0)
155 <                        version=1;      
156 <                else if (strcmp(argv[i],"-b") == 0)
157 <                        date=1;
158 <                else if (strcmp(argv[i],"-f") == 0)
159 <                        cflags=1;
160 <                else if (strcmp(argv[i],"-o") == 0)
161 <                        options=1;
162 <                else if (strcmp(argv[i],"-p") == 0)
163 <                        platform=1;
164 <                else if (strcmp(argv[i],"-d") == 0)
165 <                        dir=1;
166 <                else if (strcmp(argv[i],"-a") == 0)
167 <                        date=version=cflags=options=platform=dir=1;
168 <                else
169 <                        {
170 <                        BIO_printf(bio_err,"usage:version -[avbofpd]\n");
171 <                        ret=1;
172 <                        goto end;
173 <                        }
174 <                }
151 >    if (argc == 1)
152 >        version = 1;
153 >    for (i = 1; i < argc; i++) {
154 >        if (strcmp(argv[i], "-v") == 0)
155 >            version = 1;
156 >        else if (strcmp(argv[i], "-b") == 0)
157 >            date = 1;
158 >        else if (strcmp(argv[i], "-f") == 0)
159 >            cflags = 1;
160 >        else if (strcmp(argv[i], "-o") == 0)
161 >            options = 1;
162 >        else if (strcmp(argv[i], "-p") == 0)
163 >            platform = 1;
164 >        else if (strcmp(argv[i], "-d") == 0)
165 >            dir = 1;
166 >        else if (strcmp(argv[i], "-a") == 0)
167 >            date = version = cflags = options = platform = dir = 1;
168 >        else {
169 >            BIO_printf(bio_err, "usage:version -[avbofpd]\n");
170 >            ret = 1;
171 >            goto end;
172 >        }
173 >    }
174  
175 <        if (version)
176 <                {
177 <                if (SSLeay() == SSLEAY_VERSION_NUMBER)
178 <                        {
179 <                        printf("%s\n",SSLeay_version(SSLEAY_VERSION));
180 <                        }
181 <                else
182 <                        {
183 <                        printf("%s (Library: %s)\n",
184 <                                OPENSSL_VERSION_TEXT,
185 <                                SSLeay_version(SSLEAY_VERSION));
186 <                        }
187 <                }
188 <        if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
189 <        if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
191 <        if (options)
192 <                {
193 <                printf("options:  ");
194 <                printf("%s ",BN_options());
175 >    if (version) {
176 >        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
177 >            printf("%s\n", SSLeay_version(SSLEAY_VERSION));
178 >        } else {
179 >            printf("%s (Library: %s)\n",
180 >                   OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
181 >        }
182 >    }
183 >    if (date)
184 >        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
185 >    if (platform)
186 >        printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
187 >    if (options) {
188 >        printf("options:  ");
189 >        printf("%s ", BN_options());
190   #ifndef OPENSSL_NO_MD2
191 <                printf("%s ",MD2_options());
191 >        printf("%s ", MD2_options());
192   #endif
193   #ifndef OPENSSL_NO_RC4
194 <                printf("%s ",RC4_options());
194 >        printf("%s ", RC4_options());
195   #endif
196   #ifndef OPENSSL_NO_DES
197 <                printf("%s ",DES_options());
197 >        printf("%s ", DES_options());
198   #endif
199   #ifndef OPENSSL_NO_IDEA
200 <                printf("%s ",idea_options());
200 >        printf("%s ", idea_options());
201   #endif
202   #ifndef OPENSSL_NO_BF
203 <                printf("%s ",BF_options());
203 >        printf("%s ", BF_options());
204   #endif
205 <                printf("\n");
206 <                }
207 <        if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
208 <        if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
209 < end:
210 <        apps_shutdown();
211 <        OPENSSL_EXIT(ret);
212 <        }
205 >        printf("\n");
206 >    }
207 >    if (cflags)
208 >        printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
209 >    if (dir)
210 >        printf("%s\n", SSLeay_version(SSLEAY_DIR));
211 > end:
212 >    apps_shutdown();
213 >    OPENSSL_EXIT(ret);
214 > }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines