openssl/crypto/pem/pem_x509.c - Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: openssl/crypto/pem/pem_x509.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

OLD	NEW
1 /* pem_x509.c */	1 /* pem_x509.c */

2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL	2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

3 * project 2001.	3 * project 2001.

4 */	4 */

5 /* ====================================================================	5 /* ====================================================================

6 * Copyright (c) 2001 The OpenSSL Project. All rights reserved.	6 * Copyright (c) 2001 The OpenSSL Project. All rights reserved.

7 *	7 *

8 * Redistribution and use in source and binary forms, with or without	8 * Redistribution and use in source and binary forms, with or without

9 * modification, are permitted provided that the following conditions	9 * modification, are permitted provided that the following conditions

10 * are met:	10 * are met:

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 * OF THE POSSIBILITY OF SUCH DAMAGE.	50 * OF THE POSSIBILITY OF SUCH DAMAGE.

51 * ====================================================================	51 * ====================================================================

52 *	52 *

53 * This product includes cryptographic software written by Eric Young	53 * This product includes cryptographic software written by Eric Young

54 * (eay@cryptsoft.com). This product includes software written by Tim	54 * (eay@cryptsoft.com). This product includes software written by Tim

55 * Hudson (tjh@cryptsoft.com).	55 * Hudson (tjh@cryptsoft.com).

56 *	56 *

57 */	57 */

58	58

59 #include <stdio.h>	59 #include <stdio.h>

60 #undef SSLEAY_MACROS

61 #include "cryptlib.h"	60 #include "cryptlib.h"

62 #include <openssl/bio.h>	61 #include <openssl/bio.h>

63 #include <openssl/evp.h>	62 #include <openssl/evp.h>

64 #include <openssl/x509.h>	63 #include <openssl/x509.h>

65 #include <openssl/pkcs7.h>	64 #include <openssl/pkcs7.h>

66 #include <openssl/pem.h>	65 #include <openssl/pem.h>

67	66

68 IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)	67 IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)

69	68

OLD	NEW

« openssl.gyp ('K') | « openssl/crypto/pem/pem_pkey.c ('k') | openssl/crypto/pem/pem_xaux.c » ('j') | patches/x509_hash_name_algorithm_change.patch » ('J')