diff -r acd3cd4aaceb -r 2efc27d87e1c ssl/libcrypto/src/crypto/x509v3/ext_dat.h
--- a/ssl/libcrypto/src/crypto/x509v3/ext_dat.h	Tue Aug 31 16:54:36 2010 +0300
+++ b/ssl/libcrypto/src/crypto/x509v3/ext_dat.h	Wed Sep 01 12:36:54 2010 +0100
@@ -57,7 +57,7 @@
  */
  
 /*
- © Portions copyright (c) 2006, 2010 Nokia Corporation.  All rights reserved.
+ © Portions copyright (c) 2006 Nokia Corporation.  All rights reserved.
  */
 
 /* This file contains a table of "standard" extensions */
@@ -66,20 +66,12 @@
 #include "libcrypto_wsd.h"
 #endif
 
-/* Extra declerations are added only to satisfy the RVCT2.2.
- RVCT4.0 is perfectly fine with out the extra declerations
- (the first 2 lines below)*/
-extern X509V3_EXT_METHOD v3_ext_ku;
-extern X509V3_EXT_METHOD v3_ocsp_accresp;
-IMPORT_C extern X509V3_EXT_METHOD v3_ext_ku;
-IMPORT_C extern X509V3_EXT_METHOD v3_ocsp_accresp;
-
-extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage;
+extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
 extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo;
 extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;
 extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate;
 extern X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld;
-extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_acutoff;
+extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff;
 extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc;
 extern X509V3_EXT_METHOD v3_crl_hold, v3_pci;
 extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints;