Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: openssl/demos/pkcs12/pkread.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/demos/jpake/jpakedemo.c ('k') | openssl/demos/smime/cacert.pem » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* pkread.c */ 1 /* pkread.c */
2 2
3 #include <stdio.h> 3 #include <stdio.h>
4 #include <stdlib.h> 4 #include <stdlib.h>
5 #include <openssl/pem.h> 5 #include <openssl/pem.h>
6 #include <openssl/err.h> 6 #include <openssl/err.h>
7 #include <openssl/pkcs12.h> 7 #include <openssl/pkcs12.h>
8 8
9 /* Simple PKCS#12 file reader */ 9 /* Simple PKCS#12 file reader */
10 10
11 int main(int argc, char **argv) 11 int main(int argc, char **argv)
12 { 12 {
13 FILE *fp; 13 FILE *fp;
14 EVP_PKEY *pkey; 14 EVP_PKEY *pkey;
15 X509 *cert; 15 X509 *cert;
16 STACK_OF(X509) *ca = NULL; 16 STACK_OF(X509) *ca = NULL;
17 PKCS12 *p12; 17 PKCS12 *p12;
18 int i; 18 int i;
19 if (argc != 4) { 19 if (argc != 4) {
20 fprintf(stderr, "Usage: pkread p12file password opfile\n"); 20 fprintf(stderr, "Usage: pkread p12file password opfile\n");
21 exit (1); 21 exit (1);
22 } 22 }
23 » SSLeay_add_all_algorithms(); 23 » OpenSSL_add_all_algorithms();
24 ERR_load_crypto_strings(); 24 ERR_load_crypto_strings();
25 if (!(fp = fopen(argv[1], "rb"))) { 25 if (!(fp = fopen(argv[1], "rb"))) {
26 fprintf(stderr, "Error opening file %s\n", argv[1]); 26 fprintf(stderr, "Error opening file %s\n", argv[1]);
27 exit(1); 27 exit(1);
28 } 28 }
29 p12 = d2i_PKCS12_fp(fp, NULL); 29 p12 = d2i_PKCS12_fp(fp, NULL);
30 fclose (fp); 30 fclose (fp);
31 if (!p12) { 31 if (!p12) {
32 fprintf(stderr, "Error reading PKCS#12 file\n"); 32 fprintf(stderr, "Error reading PKCS#12 file\n");
33 ERR_print_errors_fp(stderr); 33 ERR_print_errors_fp(stderr);
(...skipping 10 matching lines...) Expand all
44 exit(1); 44 exit(1);
45 } 45 }
46 if (pkey) { 46 if (pkey) {
47 fprintf(fp, "***Private Key***\n"); 47 fprintf(fp, "***Private Key***\n");
48 PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL); 48 PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL);
49 } 49 }
50 if (cert) { 50 if (cert) {
51 fprintf(fp, "***User Certificate***\n"); 51 fprintf(fp, "***User Certificate***\n");
52 PEM_write_X509_AUX(fp, cert); 52 PEM_write_X509_AUX(fp, cert);
53 } 53 }
54 » if (ca && sk_num(ca)) { 54 » if (ca && sk_X509_num(ca)) {
55 fprintf(fp, "***Other Certificates***\n"); 55 fprintf(fp, "***Other Certificates***\n");
56 for (i = 0; i < sk_X509_num(ca); i++) 56 for (i = 0; i < sk_X509_num(ca); i++)
57 PEM_write_X509_AUX(fp, sk_X509_value(ca, i)); 57 PEM_write_X509_AUX(fp, sk_X509_value(ca, i));
58 } 58 }
59 fclose(fp); 59 fclose(fp);
60 return 0; 60 return 0;
61 } 61 }
OLDNEW
« no previous file with comments | « openssl/demos/jpake/jpakedemo.c ('k') | openssl/demos/smime/cacert.pem » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698