| gost_ameth.c (256281) | gost_ameth.c (267258) |
|---|---|
| 1/********************************************************************** 2 * gost_ameth.c * 3 * Copyright (c) 2005-2006 Cryptocom LTD * 4 * This file is distributed under the same license as OpenSSL * 5 * * 6 * Implementation of RFC 4490/4491 ASN1 method * 7 * for OpenSSL * 8 * Requires OpenSSL 0.9.9 for compilation * --- 255 unchanged lines hidden (view full) --- 264 X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type), 265 V_ASN1_SEQUENCE, params); 266 } 267 return 1; 268#ifndef OPENSSL_NO_CMS 269 case ASN1_PKEY_CTRL_CMS_ENVELOPE: 270 if (arg1 == 0) 271 { | 1/********************************************************************** 2 * gost_ameth.c * 3 * Copyright (c) 2005-2006 Cryptocom LTD * 4 * This file is distributed under the same license as OpenSSL * 5 * * 6 * Implementation of RFC 4490/4491 ASN1 method * 7 * for OpenSSL * 8 * Requires OpenSSL 0.9.9 for compilation * --- 255 unchanged lines hidden (view full) --- 264 X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type), 265 V_ASN1_SEQUENCE, params); 266 } 267 return 1; 268#ifndef OPENSSL_NO_CMS 269 case ASN1_PKEY_CTRL_CMS_ENVELOPE: 270 if (arg1 == 0) 271 { |
| 272 X509_ALGOR *alg; | 272 X509_ALGOR *alg = NULL; |
| 273 ASN1_STRING * params = encode_gost_algor_params(pkey); 274 if (!params) 275 { 276 return -1; 277 } 278 CMS_RecipientInfo_ktri_get0_algs((CMS_RecipientInfo *)arg2, NULL, NULL, &alg); 279 X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type), 280 V_ASN1_SEQUENCE, params); --- 665 unchanged lines hidden --- | 273 ASN1_STRING * params = encode_gost_algor_params(pkey); 274 if (!params) 275 { 276 return -1; 277 } 278 CMS_RecipientInfo_ktri_get0_algs((CMS_RecipientInfo *)arg2, NULL, NULL, &alg); 279 X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type), 280 V_ASN1_SEQUENCE, params); --- 665 unchanged lines hidden --- |