View | Details | Raw Unified | Return to bug 272835 | Differences between
and this patch

Collapse All | Expand All

(-)b/crypto/heimdal/lib/krb5/crypto.c (+4 lines)
Lines 2054-2059 krb5_crypto_init(krb5_context context, Link Here
2054 
	*crypto = NULL;
 2054 
	*crypto = NULL;
2055 
	return ret;
 2055 
	return ret;
2056 
    }
 2056 
    }
2057 
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
2058 
    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)
2059 
	return EINVAL;
2060 
#endif
2057 
    (*crypto)->key.schedule = NULL;
 2061 
    (*crypto)->key.schedule = NULL;
2058 
    (*crypto)->num_key_usage = 0;
 2062 
    (*crypto)->num_key_usage = 0;
2059 
    (*crypto)->key_usage = NULL;
 2063 
    (*crypto)->key_usage = NULL;
(-)b/crypto/heimdal/lib/krb5/salt.c (+14 lines)
Lines 43-48 krb5_salttype_to_string (krb5_context context, Link Here
43 
    struct _krb5_encryption_type *e;
 43 
    struct _krb5_encryption_type *e;
44 
    struct salt_type *st;
 44 
    struct salt_type *st;
45 

          45
          

        

            

              
              
              46
              
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)

            

            

              47
              
    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)

            

            

              48
              
	return EINVAL;

            

            

              49
              
#endif

            

            

              50
              

            

        

          46
          
    e = _krb5_find_enctype (etype);

          51
          
    e = _krb5_find_enctype (etype);

        

        

          47
          
    if (e == NULL) {

          52
          
    if (e == NULL) {

        

        

          48
          
	krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,

          53
          
	krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,

        

  

    
      
            Lines 75-80
          krb5_string_to_salttype (krb5_context context,
      
      
        Link Here
      
    
  

        

          75
          
    struct _krb5_encryption_type *e;

          80
          
    struct _krb5_encryption_type *e;

        

        

          76
          
    struct salt_type *st;

          81
          
    struct salt_type *st;

        

        

          77
          

          82
          

        

            

              
              
              83
              
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)

            

            

              84
              
    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)

            

            

              85
              
	return EINVAL;

            

            

              86
              
#endif

            

            

              87
              

            

        

          78
          
    e = _krb5_find_enctype (etype);

          88
          
    e = _krb5_find_enctype (etype);

        

        

          79
          
    if (e == NULL) {

          89
          
    if (e == NULL) {

        

        

          80
          
	krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,

          90
          
	krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,

        

  

    
      
            Lines 196-201
          krb5_string_to_key_data_salt_opaque (krb5_context context,
      
      
        Link Here
      
    
  

        

          196
          
			       enctype);

          206
          
			       enctype);

        

        

          197
          
	return KRB5_PROG_ETYPE_NOSUPP;

          207
          
	return KRB5_PROG_ETYPE_NOSUPP;

        

        

          198
          
    }

          208
          
    }

        

            

              
              
              209
              
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)

            

            

              210
              
    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)

            

            

              211
              
	return EINVAL;

            

            

              212
              
#endif

            

        

          199
          
    for(st = et->keytype->string_to_key; st && st->type; st++)

          213
          
    for(st = et->keytype->string_to_key; st && st->type; st++)

        

        

          200
          
	if(st->type == salt.salttype)

          214
          
	if(st->type == salt.salttype)

        

        

          201
          
	    return (*st->string_to_key)(context, enctype, password,

          215
          
	    return (*st->string_to_key)(context, enctype, password,

        



(-)b/kerberos5/include/crypto-headers.h
      (+3 lines)




  

    
      
            Lines 17-21
          
      
      
        Link Here
      
    
  

        

          17
          
#include <openssl/ec.h>

          17
          
#include <openssl/ec.h>

        

        

          18
          
#include <openssl/ecdsa.h>

          18
          
#include <openssl/ecdsa.h>

        

        

          19
          
#include <openssl/ecdh.h>

          19
          
#include <openssl/ecdh.h>

        

            

              
              
              20
              
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)

            

            

              21
              
#include <openssl/provider.h>

            

            

              22
              
#endif

            

        

          20
          

          23
          

        

        

          21
          
#endif /* __crypto_headers_h__ */

          24
          
#endif /* __crypto_headers_h__ */

        






  

  Return to bug 272835