Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 4 | |
michael@0 | 5 | /* |
michael@0 | 6 | * utilrename.h - rename symbols moved from libnss3 to libnssutil3 |
michael@0 | 7 | * |
michael@0 | 8 | */ |
michael@0 | 9 | |
michael@0 | 10 | #ifndef _LIBUTIL_H_ |
michael@0 | 11 | #define _LIBUTIL_H_ _LIBUTIL_H__Util |
michael@0 | 12 | |
michael@0 | 13 | #ifdef USE_UTIL_DIRECTLY |
michael@0 | 14 | |
michael@0 | 15 | /* functions moved from libnss3 */ |
michael@0 | 16 | #define ATOB_AsciiToData ATOB_AsciiToData_Util |
michael@0 | 17 | #define ATOB_ConvertAsciiToItem ATOB_ConvertAsciiToItem_Util |
michael@0 | 18 | #define BTOA_ConvertItemToAscii BTOA_ConvertItemToAscii_Util |
michael@0 | 19 | #define BTOA_DataToAscii BTOA_DataToAscii_Util |
michael@0 | 20 | #define CERT_GenTime2FormattedAscii CERT_GenTime2FormattedAscii_Util |
michael@0 | 21 | #define DER_AsciiToTime DER_AsciiToTime_Util |
michael@0 | 22 | #define DER_DecodeTimeChoice DER_DecodeTimeChoice_Util |
michael@0 | 23 | #define DER_Encode DER_Encode_Util |
michael@0 | 24 | #define DER_EncodeTimeChoice DER_EncodeTimeChoice_Util |
michael@0 | 25 | #define DER_GeneralizedDayToAscii DER_GeneralizedDayToAscii_Util |
michael@0 | 26 | #define DER_GeneralizedTimeToTime DER_GeneralizedTimeToTime_Util |
michael@0 | 27 | #define DER_GetInteger DER_GetInteger_Util |
michael@0 | 28 | #define DER_Lengths DER_Lengths_Util |
michael@0 | 29 | #define DER_TimeChoiceDayToAscii DER_TimeChoiceDayToAscii_Util |
michael@0 | 30 | #define DER_TimeToGeneralizedTime DER_TimeToGeneralizedTime_Util |
michael@0 | 31 | #define DER_TimeToGeneralizedTimeArena DER_TimeToGeneralizedTimeArena_Util |
michael@0 | 32 | #define DER_TimeToUTCTime DER_TimeToUTCTime_Util |
michael@0 | 33 | #define DER_UTCDayToAscii DER_UTCDayToAscii_Util |
michael@0 | 34 | #define DER_UTCTimeToAscii DER_UTCTimeToAscii_Util |
michael@0 | 35 | #define DER_UTCTimeToTime DER_UTCTimeToTime_Util |
michael@0 | 36 | #define NSS_PutEnv NSS_PutEnv_Util |
michael@0 | 37 | #define NSSBase64_DecodeBuffer NSSBase64_DecodeBuffer_Util |
michael@0 | 38 | #define NSSBase64_EncodeItem NSSBase64_EncodeItem_Util |
michael@0 | 39 | #define NSSBase64Decoder_Create NSSBase64Decoder_Create_Util |
michael@0 | 40 | #define NSSBase64Decoder_Destroy NSSBase64Decoder_Destroy_Util |
michael@0 | 41 | #define NSSBase64Decoder_Update NSSBase64Decoder_Update_Util |
michael@0 | 42 | #define NSSBase64Encoder_Create NSSBase64Encoder_Create_Util |
michael@0 | 43 | #define NSSBase64Encoder_Destroy NSSBase64Encoder_Destroy_Util |
michael@0 | 44 | #define NSSBase64Encoder_Update NSSBase64Encoder_Update_Util |
michael@0 | 45 | #define NSSRWLock_Destroy NSSRWLock_Destroy_Util |
michael@0 | 46 | #define NSSRWLock_HaveWriteLock NSSRWLock_HaveWriteLock_Util |
michael@0 | 47 | #define NSSRWLock_LockRead NSSRWLock_LockRead_Util |
michael@0 | 48 | #define NSSRWLock_LockWrite NSSRWLock_LockWrite_Util |
michael@0 | 49 | #define NSSRWLock_New NSSRWLock_New_Util |
michael@0 | 50 | #define NSSRWLock_UnlockRead NSSRWLock_UnlockRead_Util |
michael@0 | 51 | #define NSSRWLock_UnlockWrite NSSRWLock_UnlockWrite_Util |
michael@0 | 52 | #define PORT_Alloc PORT_Alloc_Util |
michael@0 | 53 | #define PORT_ArenaAlloc PORT_ArenaAlloc_Util |
michael@0 | 54 | #define PORT_ArenaGrow PORT_ArenaGrow_Util |
michael@0 | 55 | #define PORT_ArenaMark PORT_ArenaMark_Util |
michael@0 | 56 | #define PORT_ArenaRelease PORT_ArenaRelease_Util |
michael@0 | 57 | #define PORT_ArenaStrdup PORT_ArenaStrdup_Util |
michael@0 | 58 | #define PORT_ArenaUnmark PORT_ArenaUnmark_Util |
michael@0 | 59 | #define PORT_ArenaZAlloc PORT_ArenaZAlloc_Util |
michael@0 | 60 | #define PORT_Free PORT_Free_Util |
michael@0 | 61 | #define PORT_FreeArena PORT_FreeArena_Util |
michael@0 | 62 | #define PORT_GetError PORT_GetError_Util |
michael@0 | 63 | #define PORT_NewArena PORT_NewArena_Util |
michael@0 | 64 | #define PORT_Realloc PORT_Realloc_Util |
michael@0 | 65 | #define PORT_SetError PORT_SetError_Util |
michael@0 | 66 | #define PORT_SetUCS2_ASCIIConversionFunction PORT_SetUCS2_ASCIIConversionFunction_Util |
michael@0 | 67 | #define PORT_SetUCS2_UTF8ConversionFunction PORT_SetUCS2_UTF8ConversionFunction_Util |
michael@0 | 68 | #define PORT_SetUCS4_UTF8ConversionFunction PORT_SetUCS4_UTF8ConversionFunction_Util |
michael@0 | 69 | #define PORT_Strdup PORT_Strdup_Util |
michael@0 | 70 | #define PORT_UCS2_ASCIIConversion PORT_UCS2_ASCIIConversion_Util |
michael@0 | 71 | #define PORT_UCS2_UTF8Conversion PORT_UCS2_UTF8Conversion_Util |
michael@0 | 72 | #define PORT_ZAlloc PORT_ZAlloc_Util |
michael@0 | 73 | #define PORT_ZFree PORT_ZFree_Util |
michael@0 | 74 | #define SEC_ASN1Decode SEC_ASN1Decode_Util |
michael@0 | 75 | #define SEC_ASN1DecodeInteger SEC_ASN1DecodeInteger_Util |
michael@0 | 76 | #define SEC_ASN1DecodeItem SEC_ASN1DecodeItem_Util |
michael@0 | 77 | #define SEC_ASN1DecoderAbort SEC_ASN1DecoderAbort_Util |
michael@0 | 78 | #define SEC_ASN1DecoderClearFilterProc SEC_ASN1DecoderClearFilterProc_Util |
michael@0 | 79 | #define SEC_ASN1DecoderClearNotifyProc SEC_ASN1DecoderClearNotifyProc_Util |
michael@0 | 80 | #define SEC_ASN1DecoderFinish SEC_ASN1DecoderFinish_Util |
michael@0 | 81 | #define SEC_ASN1DecoderSetFilterProc SEC_ASN1DecoderSetFilterProc_Util |
michael@0 | 82 | #define SEC_ASN1DecoderSetNotifyProc SEC_ASN1DecoderSetNotifyProc_Util |
michael@0 | 83 | #define SEC_ASN1DecoderStart SEC_ASN1DecoderStart_Util |
michael@0 | 84 | #define SEC_ASN1DecoderUpdate SEC_ASN1DecoderUpdate_Util |
michael@0 | 85 | #define SEC_ASN1Encode SEC_ASN1Encode_Util |
michael@0 | 86 | #define SEC_ASN1EncodeInteger SEC_ASN1EncodeInteger_Util |
michael@0 | 87 | #define SEC_ASN1EncodeItem SEC_ASN1EncodeItem_Util |
michael@0 | 88 | #define SEC_ASN1EncoderAbort SEC_ASN1EncoderAbort_Util |
michael@0 | 89 | #define SEC_ASN1EncoderClearNotifyProc SEC_ASN1EncoderClearNotifyProc_Util |
michael@0 | 90 | #define SEC_ASN1EncoderClearStreaming SEC_ASN1EncoderClearStreaming_Util |
michael@0 | 91 | #define SEC_ASN1EncoderClearTakeFromBuf SEC_ASN1EncoderClearTakeFromBuf_Util |
michael@0 | 92 | #define SEC_ASN1EncoderFinish SEC_ASN1EncoderFinish_Util |
michael@0 | 93 | #define SEC_ASN1EncoderSetNotifyProc SEC_ASN1EncoderSetNotifyProc_Util |
michael@0 | 94 | #define SEC_ASN1EncoderSetStreaming SEC_ASN1EncoderSetStreaming_Util |
michael@0 | 95 | #define SEC_ASN1EncoderSetTakeFromBuf SEC_ASN1EncoderSetTakeFromBuf_Util |
michael@0 | 96 | #define SEC_ASN1EncoderStart SEC_ASN1EncoderStart_Util |
michael@0 | 97 | #define SEC_ASN1EncoderUpdate SEC_ASN1EncoderUpdate_Util |
michael@0 | 98 | #define SEC_ASN1EncodeUnsignedInteger SEC_ASN1EncodeUnsignedInteger_Util |
michael@0 | 99 | #define SEC_ASN1LengthLength SEC_ASN1LengthLength_Util |
michael@0 | 100 | #define SEC_QuickDERDecodeItem SEC_QuickDERDecodeItem_Util |
michael@0 | 101 | #define SECITEM_AllocItem SECITEM_AllocItem_Util |
michael@0 | 102 | #define SECITEM_ArenaDupItem SECITEM_ArenaDupItem_Util |
michael@0 | 103 | #define SECITEM_CompareItem SECITEM_CompareItem_Util |
michael@0 | 104 | #define SECITEM_CopyItem SECITEM_CopyItem_Util |
michael@0 | 105 | #define SECITEM_DupItem SECITEM_DupItem_Util |
michael@0 | 106 | #define SECITEM_FreeItem SECITEM_FreeItem_Util |
michael@0 | 107 | #define SECITEM_ItemsAreEqual SECITEM_ItemsAreEqual_Util |
michael@0 | 108 | #define SECITEM_ZfreeItem SECITEM_ZfreeItem_Util |
michael@0 | 109 | #define SECOID_AddEntry SECOID_AddEntry_Util |
michael@0 | 110 | #define SECOID_CompareAlgorithmID SECOID_CompareAlgorithmID_Util |
michael@0 | 111 | #define SECOID_CopyAlgorithmID SECOID_CopyAlgorithmID_Util |
michael@0 | 112 | #define SECOID_DestroyAlgorithmID SECOID_DestroyAlgorithmID_Util |
michael@0 | 113 | #define SECOID_FindOID SECOID_FindOID_Util |
michael@0 | 114 | #define SECOID_FindOIDByTag SECOID_FindOIDByTag_Util |
michael@0 | 115 | #define SECOID_FindOIDTag SECOID_FindOIDTag_Util |
michael@0 | 116 | #define SECOID_FindOIDTagDescription SECOID_FindOIDTagDescription_Util |
michael@0 | 117 | #define SECOID_GetAlgorithmTag SECOID_GetAlgorithmTag_Util |
michael@0 | 118 | #define SECOID_SetAlgorithmID SECOID_SetAlgorithmID_Util |
michael@0 | 119 | #define SGN_CompareDigestInfo SGN_CompareDigestInfo_Util |
michael@0 | 120 | #define SGN_CopyDigestInfo SGN_CopyDigestInfo_Util |
michael@0 | 121 | #define SGN_CreateDigestInfo SGN_CreateDigestInfo_Util |
michael@0 | 122 | #define SGN_DestroyDigestInfo SGN_DestroyDigestInfo_Util |
michael@0 | 123 | |
michael@0 | 124 | /* templates moved from libnss3 */ |
michael@0 | 125 | #define NSS_Get_SEC_AnyTemplate NSS_Get_SEC_AnyTemplate_Util |
michael@0 | 126 | #define NSS_Get_SEC_BitStringTemplate NSS_Get_SEC_BitStringTemplate_Util |
michael@0 | 127 | #define NSS_Get_SEC_BMPStringTemplate NSS_Get_SEC_BMPStringTemplate_Util |
michael@0 | 128 | #define NSS_Get_SEC_BooleanTemplate NSS_Get_SEC_BooleanTemplate_Util |
michael@0 | 129 | #define NSS_Get_SEC_GeneralizedTimeTemplate NSS_Get_SEC_GeneralizedTimeTemplate_Util |
michael@0 | 130 | #define NSS_Get_SEC_IA5StringTemplate NSS_Get_SEC_IA5StringTemplate_Util |
michael@0 | 131 | #define NSS_Get_SEC_IntegerTemplate NSS_Get_SEC_IntegerTemplate_Util |
michael@0 | 132 | #define NSS_Get_SEC_NullTemplate NSS_Get_SEC_NullTemplate_Util |
michael@0 | 133 | #define NSS_Get_SEC_ObjectIDTemplate NSS_Get_SEC_ObjectIDTemplate_Util |
michael@0 | 134 | #define NSS_Get_SEC_OctetStringTemplate NSS_Get_SEC_OctetStringTemplate_Util |
michael@0 | 135 | #define NSS_Get_SEC_PointerToAnyTemplate NSS_Get_SEC_PointerToAnyTemplate_Util |
michael@0 | 136 | #define NSS_Get_SEC_PointerToOctetStringTemplate NSS_Get_SEC_PointerToOctetStringTemplate_Util |
michael@0 | 137 | #define NSS_Get_SEC_SetOfAnyTemplate NSS_Get_SEC_SetOfAnyTemplate_Util |
michael@0 | 138 | #define NSS_Get_SEC_UTCTimeTemplate NSS_Get_SEC_UTCTimeTemplate_Util |
michael@0 | 139 | #define NSS_Get_SEC_UTF8StringTemplate NSS_Get_SEC_UTF8StringTemplate_Util |
michael@0 | 140 | #define NSS_Get_SECOID_AlgorithmIDTemplate NSS_Get_SECOID_AlgorithmIDTemplate_Util |
michael@0 | 141 | #define NSS_Get_sgn_DigestInfoTemplate NSS_Get_sgn_DigestInfoTemplate_Util |
michael@0 | 142 | #define SEC_AnyTemplate SEC_AnyTemplate_Util |
michael@0 | 143 | #define SEC_BitStringTemplate SEC_BitStringTemplate_Util |
michael@0 | 144 | #define SEC_BMPStringTemplate SEC_BMPStringTemplate_Util |
michael@0 | 145 | #define SEC_BooleanTemplate SEC_BooleanTemplate_Util |
michael@0 | 146 | #define SEC_GeneralizedTimeTemplate SEC_GeneralizedTimeTemplate_Util |
michael@0 | 147 | #define SEC_IA5StringTemplate SEC_IA5StringTemplate_Util |
michael@0 | 148 | #define SEC_IntegerTemplate SEC_IntegerTemplate_Util |
michael@0 | 149 | #define SEC_NullTemplate SEC_NullTemplate_Util |
michael@0 | 150 | #define SEC_ObjectIDTemplate SEC_ObjectIDTemplate_Util |
michael@0 | 151 | #define SEC_OctetStringTemplate SEC_OctetStringTemplate_Util |
michael@0 | 152 | #define SEC_PointerToAnyTemplate SEC_PointerToAnyTemplate_Util |
michael@0 | 153 | #define SEC_PointerToOctetStringTemplate SEC_PointerToOctetStringTemplate_Util |
michael@0 | 154 | #define SEC_SetOfAnyTemplate SEC_SetOfAnyTemplate_Util |
michael@0 | 155 | #define SEC_UTCTimeTemplate SEC_UTCTimeTemplate_Util |
michael@0 | 156 | #define SEC_UTF8StringTemplate SEC_UTF8StringTemplate_Util |
michael@0 | 157 | #define SECOID_AlgorithmIDTemplate SECOID_AlgorithmIDTemplate_Util |
michael@0 | 158 | #define sgn_DigestInfoTemplate sgn_DigestInfoTemplate_Util |
michael@0 | 159 | |
michael@0 | 160 | #endif /* USE_UTIL_DIRECTLY */ |
michael@0 | 161 | |
michael@0 | 162 | #endif /* _LIBUTIL_H_ */ |